home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,148 Commits 48 Branches 340 Tags
efde96e9cd4b0096c19ecfa46237b7eda28038aa
Commit Graph
2673 Commits
Author SHA1 Message Date
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' "" 
This reverts commit 5a586f364c
 2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' " 
This reverts merge request !3191
 2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master' 
Support Golang subpackage fetching

Closes #13805

See merge request !3191
 2016-03-12 17:38:08 +00:00
Stan Hu 2563213ccf Remove existing go_import.html.haml implementation 2016-03-12 07:49:16 -08:00
Robert Speicher ee14ac68a5 Merge branch 'group-activity-separate-tab' into 'master' 
Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157
 2016-03-11 19:58:10 +00:00
Jacob Vosmaer 6bfff2fab2 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into expiring-lock 2016-03-10 18:40:58 +01:00
Dmitriy Zaporozhets e3efce9237 Move group activity feed to separate page for consistency with dashboard and project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-10 14:29:38 +01:00
Jacob Vosmaer e7df3f51c9 Move method to User 2016-03-10 12:37:14 +01:00
Jacob Vosmaer cda0b7e1b1 Rename ExpiringLock to ExclusiveLease 2016-03-10 10:41:16 +01:00
Josh Frye 449954ecc2 Allow filtered dashboard/explore results to be paged. Fixes #14104 2016-03-09 21:03:28 -05:00
Jacob Vosmaer acd9bc0213 Acquire lock before LDAP sync 2016-03-09 19:11:24 +01:00
Dmitriy Zaporozhets c674ffe0e0 Merge branch 'improve-archived-projects' 2016-03-09 09:51:59 +01:00
Yatish MehtaandRémy Coutable 6ac68d8cb0 Remove instance variable @group multiple assignment 2016-03-08 16:48:00 +01:00
Douwe Maan afb8d76f3c Merge branch 'cache-raw-2' into 'master' 
Set cache headers for raw blobs

This changes allows browsers and (in the case of public projects)
proxy caches to cache raw Git blob responses.

See merge request !3113
 2016-03-07 22:05:15 +00:00
Douwe Maan 903aa7c95e Merge branch 'issue_13621_2' into 'master' 
Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931
 2016-03-07 17:18:25 +00:00
Jacob Vosmaer 41bc9c463c Refactor caching code 2016-03-07 14:27:53 +01:00
Rubén Dávila 95b06a62c0 Updates from last code review. 2016-03-06 23:07:19 -05:00
Douwe Maan 2f6ded6df9 Merge branch 'rs-no-default-credentials' into 'master' 
Allow the initial admin to set a password

Closes #1980

See merge request !3068
 2016-03-04 23:48:56 +00:00
Robert Speicher 599a6d7873 Allow the initial admin to set a password 
Closes #1980
 2016-03-04 17:37:57 -05:00
Douwe Maan 3231ea10b7 Merge branch 'fix/sentry-1182' into 'master' 
In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today

For some reason, GoogleBot accesses `/u/:username/calendar_activities` without
a `:date` param, but then the view was trying to call `#to_s(:short)` which
doesn't exist on `nil`, leading to the following Sentry report:
https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/

See merge request !3074
 2016-03-04 20:59:58 +00:00
Dmitriy Zaporozhets 2c431f89b1 Add projects list sort dropdown to group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-04 19:26:10 +01:00
Dmitriy Zaporozhets acb211215c Add option to show archived projects on dahsboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-04 19:25:28 +01:00
Dmitriy Zaporozhets d6f26e41db Merge remote-tracking branch 'origin/sort-starred-projects' 2016-03-04 14:24:22 +01:00
Grzegorz Bizon bf921d084e Invalidate cache for builds badge 
Closes #13982
 2016-03-04 10:34:35 +01:00
Robert Speicher 1b10724e08 Don't abuse the flash store for displaying SSH Key form errors 2016-03-03 16:13:59 -05:00
Robert Speicher 01b89ee8f1 Remove Profile::KeysController#new action 2016-03-03 16:13:59 -05:00
Phil HughesandRobert Speicher 1d4418bc5f Fixed failing ssh key tests 2016-03-03 16:13:55 -05:00
Phil HughesandRobert Speicher 1efe105415 SSH keys settings 
Closes #13860
 2016-03-03 16:13:55 -05:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Jacob Vosmaer fc90d9e589 Tell clients/proxies to cache raw blob requests 2016-03-03 17:59:47 +01:00
Dmitriy Zaporozhets afe9a07a9e Revert "Revert "Sort starred projects on dashboard based on last activity by default"" 
This reverts commit 617bb1096d.
 2016-03-03 16:00:09 +01:00
Dmitriy Zaporozhets 617bb1096d Revert "Sort starred projects on dashboard based on last activity by default" 
This reverts commit 70d6455284.
 2016-03-03 15:58:00 +01:00
Dmitriy Zaporozhets 70d6455284 Sort starred projects on dashboard based on last activity by default 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-03 15:56:29 +01:00
Dmitriy Zaporozhets 11b6aeafba Merge branch 'refactor-projects-list' into 'master' 
Refactor projects list

1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 @DouweM 

See merge request !3075
 2016-03-03 14:35:41 +00:00
Douwe Maan 1cb4f810a5 Merge branch 'issue_13648' into 'master' 
Reuse query from ProjectsFinder to get projects accessible to current user.

Fixes #13648

This is a refactor to reuse the existing query from our `ProjectsFinder` class

See merge request !3049
 2016-03-03 14:28:25 +00:00
Dmitriy Zaporozhets 7455d950bc Refactor projects list 
1. Fix double bottom border if pagination
2. Fix broken search on forks page
4. Remove duplicate js logic
4. Remove unused show all link
5. Remove duplicate “no project” message in different views

After this merge request you can easily render shared projects template
with all necessary html/js included to make searchable list with
pagination. All you need to provide is controller that returns
projects list with seach nad pagination and render html form with
project-filter-form id and text field with filter_projects name.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-03 13:09:58 +01:00
Rémy Coutable dec4e89e5b In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today 
For some reason, GoogleBot accesses /u/:username/calendar_activities without
a :date param, but then the view was trying to call #to_s(:short) which
doesn't exist on nil, leading to the following Sentry report:
https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/
 2016-03-03 12:16:32 +01:00
Dmitriy Zaporozhets 7e710acc1c Merge branch 'issue_4095' into 'master' 
Don't show Issues/MRs from archived projects in Groups view

Fixes #4095 

See merge request !2980
 2016-03-03 09:53:06 +00:00
Jacob Schatz 1fa7671f44 Merge branch 'improve-user-tabs' into 'master' 
Add routes and actions for dynamic tab loading. Closes #13588 and #13584



See merge request !2961
 2016-03-03 00:13:19 +00:00
Rubén Dávila b41a274b62 Don't list merge requests from archived projects in Group view. 2016-03-02 12:51:29 -05:00
Rubén Dávila 0b86b46a2c Don't list issues from archived projects in Group view. 2016-03-02 12:51:29 -05:00
Rubén Dávila 49e4ef3b41 Add specs to ForksController#index. 
* Also refactor query to get projects accessible for current user.
  ProjectsFinder actually return public projects when no user is passed.
 2016-03-02 12:35:56 -05:00
Rémy Coutable cb6af81670 Merge branch 'fix/13781-delete-tag-without-ajax' into 'master' 
Tag deletion doesn't use AJAX anymore



See merge request !2986
 2016-03-02 13:02:41 +00:00
Douwe Maan 30be3cf5e2 Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into 'master' 
Don't show "Welcome to GitLab" when the search didn't return any projects

Fixes #13785. /cc @pixdrift

### Before

![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png)

### After

![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png)

See merge request !3059
 2016-03-02 12:15:45 +00:00
Douwe Maan 386d442a18 Merge branch 'fix/deprecated-ci-badge-permissions' into 'master' 
Fix permissions for deprecated CI build status badge

This fixes permissions for deprecated status badge, being unavailable even if project is public.

Closes #13324

See merge request !3030
 2016-03-02 11:00:25 +00:00
Rémy Coutable a3f0a176ff Don't show "Welcome to GitLab" when the search didn't return any projects 2016-03-02 11:41:35 +01:00
Robert Speicher 6aa50165b0 Merge branch 'logged-out-search' into 'master' 
Logged out search

Fixes #13676  

See merge request !3045
 2016-03-01 19:57:10 +00:00
Grzegorz Bizon 8b02d962ab Do not require authentication for CI status badge 
This changes only deprecated CI badge that we keep for backwards
compatibility. See !3030#note_4041498.
 2016-03-01 20:32:30 +01:00
Alfredo Sumaran 9f1c3bb765 Merge branch 'master' into improve-user-tabs 2016-03-01 13:37:03 -05:00
Rubén Dávila 0e1d440805 Reuse query from ProjectsFinder to get projects accessible to current user. 2016-03-01 12:48:09 -05:00