summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'rs-deduplicate-notification-service-spec' into 'master'Rémy Coutable2017-07-311-37/+10
|\ | | | | | | | | De-duplicate two specs in spec/services/notification_service_spec See merge request !13168
| * De-duplicate two specs in spec/services/notification_service_specrs-deduplicate-notification-service-specRobert Speicher2017-07-281-37/+10
| | | | | | | | | | | | | | | | | | There were two specs that were testing the exact same thing as the spec above it, but with additional expectations. So we opted to keep the "more expectations" tests and deleted the duplicates. We've also deleted one nested `before` block that was duplicating setup of its parent context.
* | Merge branch 'cherry-pick-41db362c' into 'master'Rémy Coutable2017-07-311-1/+3
|\ \ | | | | | | | | | | | | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2' See merge request !13170
| * | Merge branch '35643-impersonate-spec' into '9-4-stable-patch-2'cherry-pick-41db362cRémy Coutable2017-07-281-1/+3
| | | | | | | | | | | | | | | Resolve "Impersonation Tokens creation spec failure in admin_users_impersonation_tokens_spec.rb" See merge request !13145
* | | Merge branch 'gitaly-398-git-garbage-collect' into 'master'Sean McGivern2017-07-311-9/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Migrate GitGarbageCollectWorker to Gitaly Closes gitaly#398 See merge request !12975
| * | Migrate GitGarbageCollectWorker to Gitalygitaly-398-git-garbage-collectKim "BKC" Carlbäcker2017-07-281-9/+43
| | |
* | | Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into ↵Robert Speicher2017-07-285-19/+15
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 'master' Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs Closes #35599 See merge request !13126
| * | Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overridingRémy Coutable2017-07-281-6/+4
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable2017-07-284-13/+11
| | | | | | | | | | | | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'rs-fix-master' into 'master'Robert Speicher2017-07-281-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Fix spec/features/projects/branches_spec See merge request !13163
| * | | Fix spec/features/projects/branches_specRobert Speicher2017-07-281-3/+3
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8666
* | | | Merge branch 'dm-large-push-performance' into 'master'Robert Speicher2017-07-281-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load and process at most 100 commits when pushing into default branch Closes #35531 See merge request !13132
| * | | | Load and process at most 100 commits when pushing into default branchDouwe Maan2017-07-281-4/+2
| | | | |
* | | | | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-282-1/+88
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
| * | | | Fix replying to commit comments on MRs from forksSean McGivern2017-07-282-1/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A commit comment shows in the MR, but if the MR is from a fork, it will have a different project ID to the MR's target project. In that case, add an note_project_id param so that we can pick the correct project for the note.
* | | | | Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_idRichard Clamp2017-07-281-3/+3
| | | | |
* | | | | Merge branch ↵Grzegorz Bizon2017-07-281-2/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline' into 'master' Resolve "Comment appears in a wrong place after changing diff view to inline" Closes #35695 See merge request !13156
| * | | | | Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inlineSean McGivern2017-07-281-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you change the diff view (inline / side-by-side), we set a cookie based on that new view. When you add a comment, we choose the style to use in the response based on that cookie. However, when you have just changed diff style, the request cookie will contain the old value, so we should use the view param instead.
* | | | | | Fix 500 error when rendering avatar for deleted project creatorAthar Hameed2017-07-281-0/+19
| | | | | |
* | | | | | Merge branch 'merge-issuable-reopened-into-opened-state' into 'master'Sean McGivern2017-07-2810-26/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge issuable "reopened" state into "opened" See merge request !12972
| * | | | | | Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-2810-26/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having two states that essentially mean the same thing is very much like having a boolean "true" and boolean "mostly-true": it's rather silly. This commit merges the "reopened" state into the "opened" state while taking care of system notes still showing messages along the lines of "Alice reopened this issue". A big benefit from having only two states (opened and closed) is that indexing and querying becomes simpler and more performant. For example, to get all the opened queries we no longer have to query both states: SELECT * FROM issues WHERE project_id = 2 AND state IN ('opened', 'reopened'); Instead we can query a single state directly, which can be much faster: SELECT * FROM issues WHERE project_id = 2 AND state = 'opened'; Further, only having two states makes indexing easier as we will only ever filter (and thus scan an index) using a single value. Partial indexes could help but aren't supported on MySQL, complicating the development process and not being helpful for MySQL.
* | | | | | | Merge branch 'log_webhook_timeout' into 'master'Rémy Coutable2017-07-281-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Log web hook execution timeout events See merge request !13134
| * | | | | | Log web hook execution timeout eventsAlex Lossent2017-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a web hook HTTP request is sent but no response comes within a certain time (10s by default), the hook execution fails and will be retried. This commit makes such timeouts visible in the web hook log, like connection timeouts already are. Also log "no route to host" errors.
* | | | | | | Merge branch 'remove-default-access-levels' into 'master'Rémy Coutable2017-07-282-15/+71
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Make access level for protected tag factories more compatible with EE See merge request !13133
| * | | | | | Make access level more compatible with EELin Jen-Shin2017-07-282-15/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So the behaviour would be similar in CE and EE
* | | | | | | Merge branch 'feature/sm/35282-ci_pipeline_variables-2' into 'master'Kamil Trzciński2017-07-287-9/+118
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up from "Allow to use cross project pipelines" ver 2 Closes #35282, gitlab-ee#2604, and #35584 See merge request !13102
| * | | | | | Expand pipeline_trigger_service_spec by godfat requestfeature/sm/35282-ci_pipeline_variables-2Shinya Maeda2017-07-281-16/+28
| | | | | | |
| * | | | | | Fix static snalysysShinya Maeda2017-07-281-1/+1
| | | | | | |
| * | | | | | Use let(:params) instead of def paramShinya Maeda2017-07-281-9/+10
| | | | | | |
| * | | | | | Use let(:pipeline) for variables spec in triggers_spec.rbShinya Maeda2017-07-281-2/+1
| | | | | | |
| * | | | | | Fix pipelineShinya Maeda2017-07-281-9/+0
| | | | | | |
| * | | | | | fix merge missShinya Maeda2017-07-281-0/+4
| | | | | | |
| * | | | | | initShinya Maeda2017-07-287-13/+115
| |/ / / / /
* | | | | | Merge branch 'rs-empty_project-features' into 'master'Rémy Coutable2017-07-28148-213/+217
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `:empty_project` where possible in feature specs See merge request !13118
| * | | | | | Use `empty_project` where possible in spec/features/securityrs-empty_project-featuresRobert Speicher2017-07-276-6/+9
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/merge_requestsRobert Speicher2017-07-2729-42/+42
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/issuesRobert Speicher2017-07-2718-30/+30
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/projectsRobert Speicher2017-07-2773-97/+95
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/issuablesRobert Speicher2017-07-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (It wasn't possible.)
| * | | | | | Use `empty_project` where possible in spec/features/atomRobert Speicher2017-07-274-5/+5
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/profilesRobert Speicher2017-07-271-3/+3
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/exploreRobert Speicher2017-07-271-1/+1
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/groupsRobert Speicher2017-07-273-5/+5
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/adminRobert Speicher2017-07-274-11/+14
| | | | | | |
| * | | | | | Use `empty_project` where possible in spec/features/dashboardRobert Speicher2017-07-277-10/+10
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'zj-delete-mm-team' into 'master'Douwe Maan2017-07-281-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Mattermost team with GitLab group Closes #30023 See merge request !11362
| * | | | | | Remove Mattermost team with GitLab groupZ.J. van de Weg2017-07-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When destroying a group, now an API call is made to the Mattermost server to request the deletion of the project. Actual team deletion on the Mattermost side happens async, so the runtime shouldn't increase by more than a second.
* | | | | | | Merge branch 'gitaly-ruby-bundler' into 'master'Sean McGivern2017-07-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support the fact that Gitaly uses bundler See merge request !13135
| * | | | | | | Support the fact that Gitaly uses bundlerJacob Vosmaer2017-07-271-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'backport-refator-git-push-service-spec' into 'master'Douwe Maan2017-07-281-100/+99
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | [Backport from EE] Refactors GitPushService spec code See merge request !13148