summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Specs for the DeleteUserServiceworker-for-user-deletionZeger-Jan van de Weg2016-03-152-49/+69
|
* Clearify who deletes the userZeger-Jan van de Weg2016-03-152-4/+5
|
* Fix broken specsZeger-Jan van de Weg2016-03-151-9/+6
|
* Target right release, rebase got it wrongZeger-Jan van de Weg2016-03-151-2/+2
|
* Specs on force deleting of a userZeger-Jan van de Weg2016-03-151-6/+42
|
* A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg2016-03-151-0/+22
| | | | Fixes #13261
* Improving the original label-subscribing implementationRémy Coutable2016-03-158-137/+259
| | | | | | | 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-157-15/+216
| | | | | | | | | | | | | | | | | | 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.
* Merge branch 'fix-activerecord-join-stupidity' into 'master' Robert Speicher2016-03-151-0/+6
|\ | | | | | | | | | | | | | | 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-151-0/+6
| | | | | | | | | | | | | | | | | | | | 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 'revert-avatar-cropping' into 'master' Rémy Coutable2016-03-156-39/+6
|\ \ | | | | | | | | | | | | | | | | | | 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-156-39/+6
| |/ | | | | | | | | This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
* | Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' Douwe Maan2016-03-151-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | 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-081-0/+5
| | | | | | | | | | | | Fixes #13928
* | | Merge branch 'fix/ensure-no-new_ssh_key_email-dead-jobs' into 'master' Douwe Maan2016-03-151-1/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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 'auto-gc' into 'master' revert-01160fc0Douwe Maan2016-03-152-0/+87
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-9/+21
| | |
| * | Use strings instead of symbolsauto-gcJacob Vosmaer2016-03-141-3/+3
| | |
| * | Run 'git gc' every 10 pushesJacob Vosmaer2016-03-142-1/+36
| | |
| * | Allow project housekeeping only once an hourJacob Vosmaer2016-03-141-0/+40
| | |
* | | Merge branch 'rs-issue-14220' into 'master' Douwe Maan2016-03-151-0/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be more intelligent about sanitizing links with unsafe protocols This prevents false matches on relative links like `[database](database.md)`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220 See merge request !3210
| * | | Be more intelligent about sanitizing links with unsafe protocolsrs-issue-14220Robert Speicher2016-03-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents false matches on relative links like `[database](database.md)`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220
* | | | Merge branch 'fix-commit-status-rendering' into 'master' Robert Speicher2016-03-152-91/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup Ci::Commit, Ci::Build and CommitStatus views This MR tries to do first sweep of cleanups to Ci::Commit and Ci::Build objects removing all view-related functions and fixing the API from other side. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046 See merge request !2760
| * | | | Fix review commentsfix-commit-status-renderingKamil Trzcinski2016-03-141-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove unused Gitlab::Application.routes.url_helpers from Ci::Build - Remove too much logic from a view, use Ci::Commit.matrix_builds - Use ci_status_with_icon - Don't describe symbols
| * | | | Fix commit_spec: invalid validationKamil Trzcinski2016-03-141-1/+1
| | | | |
| * | | | Cleanup CiCommit and CiBuildKamil Trzcinski2016-03-142-75/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | - Remove all view related methods from Ci::Build and CommitStatus - Remove unused Ci::Commit and Ci::Build methods - Use polymorphism to render different types of CommitStatus
* | | | Merge branch 'gitlab-ci-yaml-updates' into 'master' Douwe Maan2016-03-141-1/+83
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New CI YAML features This introduces a couple of small `.gitlab-ci.yml` features: 1. Documentation for: Allow to use YAML anchors when parsing the `.gitlab-ci.yml`: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2958 2. Ignore jobs that start with `.` 3. Allow to pass name of created artifacts archive in `.gitlab-ci.yml` 4. Allow to define on which builds the current one depends on These are really small changes so it makes not sense to create a separate merge requests for them. @axil Could you review the documentation part? The implementation on GitLab Runner side: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/113. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/13755 https://gitlab.com/gitlab-org/gitlab-ce/issues/14211 https://gitlab.com/gitlab-org/gitlab-ce/issues/3423 cc @grzesiek @axil @DouweM See merge request !3182
| * | | Merge branch 'master' into gitlab-ci-yaml-updatesAchilleas Pipinellis2016-03-1225-440/+459
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into gitlab-ci-yaml-updatesKamil Trzcinski2016-03-112-3/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
| * | | | | Allow to define on which builds the current one depends onKamil Trzcinski2016-03-111-0/+45
| | | | | |
| * | | | | Allow to pass name of created artifacts archive in `.gitlab-ci.yml`Kamil Trzcinski2016-03-111-1/+9
| | | | | |
| * | | | | Describe special YAML features: the use of anchors and hidden jobsKamil Trzcinski2016-03-111-0/+29
| | | | | |
* | | | | | Merge branch 'rs-note-active-spec' into 'master'Robert Speicher2016-03-141-1/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unit specs for `Note#active?` See merge request !3133
| * | | | | | Add unit specs for `Note#active?`rs-note-active-specRobert Speicher2016-03-111-1/+61
| | | | | | |
* | | | | | | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-145-1/+136
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Bring share project with group API from EEshare-project-ceDmitriy Zaporozhets2016-03-131-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Bring shared project feature tests from EEDmitriy Zaporozhets2016-03-122-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Bring ProjectGroupLink model and migrations from EEDmitriy Zaporozhets2016-03-112-0/+23
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'rs-snippet-expires-api' into 'master' Robert Speicher2016-03-141-0/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't remove `ProjectSnippet#expires_at` from API See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53. See merge request !3144
| * | | | | | Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-apiRobert Speicher2016-03-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53.
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-141-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix denting and specZeger-Jan van de Weg2016-03-131-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-0/+30
| | | | | | | | | | | | | | | | | | | | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
* | | | | | | Remove unnecessary go-get test (superseded by middleware)Stan Hu2016-03-121-13/+0
| | | | | | |
* | | | | | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-30/+0
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !3191
* | | | | | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-121-0/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191
| * | | | | | Add spec for go-import middlewareStan Hu2016-03-121-0/+30
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-gh-pr-import' into 'master' Douwe Maan2016-03-121-36/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix importing PR's from GitHub when the source repo was removed Closes #13847 Closes gitlab-com/support-forum#584 See merge request !3172
| * | | | | | Fix importing PR's from GitHub when the source repo was removedDouglas Barbosa Alexandre2016-03-101-36/+28
| | | | | | |