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,289 Commits 48 Branches 340 Tags
49f2a4e3a6ebe2deb02abe48145e5ff33ccb7971
Commit Graph
2699 Commits
Author SHA1 Message Date
Zeger-Jan van de Weg 8077a5f958 Clearify who deletes the user 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg a09323c9f5 Fix broken specs 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg b221d11a25 Add ability to delete a user with force 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg 4bcc097750 A worker deletes a user, so the request doesn't time out 
Fixes #13261
 2016-03-15 21:09:25 +01:00
Rémy Coutable e90d6ec1d8 Create a SentNotification record for #relabeled_issue_email / #relabeled_merge_request_email 2016-03-15 18:36:54 +01:00
Rémy Coutable c98089b2b2 Move the #toggle_subscription controller method to a concern 2016-03-15 18:22:03 +01:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation 
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
 2016-03-15 18:22:02 +01:00
Timothy AndrewandRémy Coutable 0444fa560a Original implementation to allow users to subscribe to labels 
1. Allow subscribing (the current user) to a label

- Refactor the `Subscription` coffeescript class
  - The main change is that it accepts a container, and conducts all
    DOM queries within its scope. We need this because the labels
    page has multiple instances of `Subscription` on the same page.

2. Creating an issue or MR with labels notifies users subscribed to those labels

- Label `has_many` subscribers through subscriptions.

3. Adding a label to an issue or MR notifies users subscribed to those labels

- This only applies to subscribers of the label that has just been
  added, not all labels for the issue.
 2016-03-15 17:25:37 +01:00
Rémy Coutable 5c1f6f8cfc Merge branch 'revert-avatar-cropping' into 'master' 
Revert the avatar cropping feature

Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping

See merge request !3223
 2016-03-15 15:53:42 +00:00
Robert Speicher 90e91e28e4 Merge branch 'application-settings' into 'master' 
Applications tab on profile settings

Closes #13855

See merge request !3031
 2016-03-15 14:33:14 +00:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' " 
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
 2016-03-15 14:55:40 +01:00
Douwe Maan ea7d062fa6 Merge branch 'auto-gc' into 'master' 
Run 'git gc' every 10 pushes

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14250

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12620

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/254

Associated gitlab-shell MR:
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/44

See merge request !3206
 2016-03-15 10:51:38 +00:00
Jacob Vosmaer 30b36c92c3 Use an exception to pass messages 2016-03-15 11:03:43 +01:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master' 
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

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

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
 2016-03-14 16:38:52 +00:00
Jacob Vosmaer a02fe251df Allow project housekeeping only once an hour 2016-03-14 15:55:45 +01:00
Marin Jankovski 90c10f4dab Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-03-14 11:40:17 +01:00
Robert Speicher 8f21e2ae40 Let oauth/applications#index handle the profiles#applications route 
Previously we were doing all of kinds of code gymnastics and flash abuse
in order to work with a Doorkeeper controller but have it _appear_ at
the `/profile/applications` path. Fortunately we can just tell Rails to
use a different controller to handle that route, and we get the best of
both worlds.
 2016-03-13 16:51:09 -04:00
Zeger-Jan van de Weg 5352ec2e21 Fix denting and spec 2016-03-13 13:44:31 +01:00
Zeger-Jan van de Weg dfb96ed84b ContinueToParams -> ContinueParams 2016-03-13 13:13:19 +01:00
Zeger-Jan van de Weg 1cefb73a9c Check redirect path in the continue_params 
Fixes
https://dev.gitlab.org/gitlab/gitlabhq/issues/2649
https://gitlab.com/gitlab-org/gitlab-ce/issues/13956
 2016-03-13 13:13:19 +01:00
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
Dmitriy Zaporozhets e1dffa32db Render project members from shared group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-12 18:02:16 +01: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
Dmitriy Zaporozhets 9a95b15552 Add share project from group lock 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-11 19:03:19 +01:00
Dmitriy Zaporozhets f8163c81e7 Show shared projects on group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-11 18:42:16 +01:00
Dmitriy Zaporozhets 746ac56b6f Add functionality to setup share of project with group via project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-11 18:37:46 +01: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
Phil Hughes be390cff65 Fixed Ruby style error 2016-03-04 09:06:07 +00:00
Phil Hughes 33ba32e6cc Applications tab on profile settings 
Closes #13855
 2016-03-04 09:06:07 +00:00