summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Specs for the DeleteUserServiceworker-for-user-deletionZeger-Jan van de Weg2016-03-153-50/+69
|
* Clearify who deletes the userZeger-Jan van de Weg2016-03-156-9/+10
|
* Fix broken specsZeger-Jan van de Weg2016-03-152-10/+7
|
* Target right release, rebase got it wrongZeger-Jan van de Weg2016-03-152-2/+3
|
* Specs on force deleting of a userZeger-Jan van de Weg2016-03-152-7/+43
|
* Add ability to delete a user with forceZeger-Jan van de Weg2016-03-156-18/+22
|
* A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-154-1/+34
| | | | Fixes #13261
* Merge branch '12743-subscribe-to-label' into 'master' Rémy Coutable2016-03-1541-137/+660
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow subscribing to labels This implement #12743 and supersedes !2799 (thanks @timothyandrew!). - Subscribe (and unsubscribe) for labels - When an issue/merge request is created, notify all subscribers of all its labels - When an issue/merge request is edited, notify all subscribers of all its newly-added labels ## Done - [x] Verify that a user is signed in to subscribe/unsubscribe from a label. - [x] Merge conflicts - [x] Integration tests - [x] `issuable.subscribed?` should check subscribers and participants - [x] When an issuable is relabeled, notify subscribers of the *newly added* labels only - [x] Screenshots: ### Labels page ![Screen_Shot_2016-03-07_at_19.05.44](/uploads/3e69064e9e1a06ee2e27c778776c1407/Screen_Shot_2016-03-07_at_19.05.44.png) ### HTML email ![Screen_Shot_2016-03-07_at_19.07.36](/uploads/e484e06366a738385f1f6d71b52eecf7/Screen_Shot_2016-03-07_at_19.07.36.png) ### Plain text email ![Screen_Shot_2016-03-07_at_19.07.50](/uploads/dc05f710a8f7ab5eae9f72aa2110e741/Screen_Shot_2016-03-07_at_19.07.50.png) PS: I've set the milestone to 8.6 since it's getting late for 8.5... See merge request !3115
| * Create a SentNotification record for #relabeled_issue_email / ↵Rémy Coutable2016-03-153-10/+23
| | | | | | | | #relabeled_merge_request_email
| * Move the #toggle_subscription controller method to a concernRémy Coutable2016-03-153-28/+15
| |
| * Improving the original label-subscribing implementationRémy Coutable2016-03-1536-310/+439
| | | | | | | | | | | | | | 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
| * Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-1531-64/+458
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Add 8.5.6 CHANGELOG itemsRémy Coutable2016-03-151-0/+3
| | | | | | | | [ci skip]
* | Merge branch 'css-style-guide' into 'master' Jacob Schatz2016-03-158-0/+393
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSS style guide Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI. TODO: - [x] Agree on and write SCSS Style Guide Documentation. - [x] Document the `scss-lint` config file. - [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should. - [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?). My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect. Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources. /cc @jschatz1 @rspeicher See merge request !3069
| * | Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add ↵connorshea2016-03-148-0/+393
| | | | | | | | | | | | | | | | | | documentation for SCSS Style Guide. See !3069 for more information.
* | | Merge branch 'if-statement-syntax-fix' into 'master' Robert Speicher2016-03-151-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove parentheses from if statement Otherwise Rubocop will give a warning after we upgrade it. As discussed in !3197. [ci skip] See merge request !3231
| * | Remove parentheses from if statementconnorshea2016-03-151-1/+1
|/ / | | | | | | | | | | Otherwise Rubocop will give a warning. As mentioned in !3197.
* | Merge branch 'fix-activerecord-join-stupidity' into 'master' Robert Speicher2016-03-152-0/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | Ignore eager loading in Project.search UNION This fixes issues such as filtering groups by names on pages such as https://gitlab.com/dashboard/groups. See merge request !3229
| * | Ignore eager loading in Project.search UNIONYorick Peterse2016-03-152-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The queries that are UNION'd together don't need any eager loading (since we really only use the resulting SQL instead of having ActiveRecord actually run the queries). By dropping any eager loaded associations queries such as the following work instead of producing a SQL error: Project.all.includes(:namespace).search('foo')
* | | Merge branch 'todos-title-attr' into 'master' Robert Speicher2016-03-156-8/+8
|\ \ \ | | | | | | | | | | | | | | | | Set link title for todos. Closes #14042 See merge request !3161
| * | | Remove last to_referencetodos-title-attrJosh Frye2016-03-131-1/+1
| | | |
| * | | Escape!Josh Frye2016-03-115-8/+8
| | | |
| * | | Title attributes for activity feedJosh Frye2016-03-117-10/+10
| | | |
| * | | RubocopJosh Frye2016-03-101-1/+1
| | | |
| * | | Set link title for todos. Closes #14042Josh Frye2016-03-101-1/+1
| | | |
* | | | Merge branch 'external-issue-tracker' into 'master' Yorick Peterse2016-03-151-0/+1
|\ \ \ \ | | | | | | | | | | See merge request !3218
| * | | | Return the external issue tracker even if it's nullexternal-issue-trackerKamil Trzcinski2016-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This solves the problem with caching the nil value with instance variable. Without this the every time we ask for external_issue_tracker we built AR and potentially do SQL query
* | | | | Merge branch 'patch-1' into 'master' Jeroen van Baarsen2016-03-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in Ruby CI test and deploy example [skip ci] See merge request !3201
| * | | | | Fix typo in Ruby CI test and deploy exampleJasper Denkers2016-03-141-1/+1
| | | | | |
* | | | | | Merge branch 'revert-avatar-cropping' into 'master' Rémy Coutable2016-03-1521-3538/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the avatar cropping feature Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping See merge request !3223
| * | | | | | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-1521-3538/+17
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
* | | | | | Merge branch 'ci-fix-double-borders' into 'master' Robert Speicher2016-03-153-7/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double borders around the CI status Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14281 Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2760#note_4238291 See merge request !3224
| * | | | | | Use klass instead of clazzci-fix-double-bordersKamil Trzcinski2016-03-151-3/+3
| | | | | | |
| * | | | | | Fix double borders around the CI statusKamil Trzcinski2016-03-153-7/+9
| |/ / / / /
* | | | | | Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' Douwe Maan2016-03-156-2/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "iid of max iid" in Issuable sidebar for merged MR Fixes #13928. See merge request !3046
| * | | | | | Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iidRémy Coutable2016-03-086-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13928
* | | | | | | Merge branch 'fix/ensure-no-new_ssh_key_email-dead-jobs' into 'master' Douwe Maan2016-03-154-3/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure "new SSH key" email do not ends up as dead Sidekiq jobs Related to #2235. This is done by: 1. Delaying the notification sending after the SSH key is commited in DB 2. Gracefully exit the mailer method if the record cannot be found /cc @dblessing @stanhu @DouweM See merge request !3163
| * | | | | | | Ensure "new SSH key" email do not ends up as dead Sidekiq jobsfix/ensure-no-new_ssh_key_email-dead-jobsRémy Coutable2016-03-154-3/+12
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to #2235. This is done by: 1. Delaying the notification sending after the SSH key is commited in DB 2. Gracefully exit the mailer method if the record cannot be found
* | | | | | | Merge branch 'bundler-audit-only-master' into 'master' Robert Speicher2016-03-151-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundle:audit job only on master As discussed in !3215 See merge request !3227
| * | | | | | | bundle:audit job only on masterZeger-Jan van de Weg2016-03-151-1/+3
| | | | | | | |
* | | | | | | | Merge branch 'application-settings' into 'master' Robert Speicher2016-03-1512-134/+143
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications tab on profile settings Closes #13855 See merge request !3031
| * | | | | | | Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settingsRobert Speicher2016-03-136-124/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Removed page specific variablesPhil Hughes2016-03-043-9/+12
| | | | | | | |
| * | | | | | | Moved scss values into variablesPhil Hughes2016-03-043-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed heading weight
| * | | | | | | Fixed Ruby style errorPhil Hughes2016-03-041-1/+1
| | | | | | | |
| * | | | | | | Fixed failing application settings testsPhil Hughes2016-03-043-10/+5
| | | | | | | |
| * | | | | | | Applications tab on profile settingsPhil Hughes2016-03-046-86/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13855
* | | | | | | | Merge branch 'auto-gc' into 'master' revert-01160fc0Douwe Maan2016-03-157-5/+139
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Use an exception to pass messagesJacob Vosmaer2016-03-155-23/+42
| | | | | | | | |
| * | | | | | | | Use strings instead of symbolsauto-gcJacob Vosmaer2016-03-141-3/+3
| | | | | | | | |