summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken test in chrome24927-custom-event-polyfill-testFilipa Lacerda2016-12-131-3/+3
|
* Fix broken testFilipa Lacerda2016-12-091-3/+3
|
* Adds tests for Custom Event polyfillFilipa Lacerda2016-12-081-0/+43
| | | | Update changelog with MR ID
* Merge branch '24507_remove_deleted_branch_link_in_merge_request' into 'master' Sean McGivern2016-12-081-0/+41
|\ | | | | | | | | | | | | Remove unnecessary target branch link from MR page in case of deleted target branch Fixes #24507 See merge request !7916
| * add link_to_if helper on target_branch link on Merge Request show page for ↵Rydkin Maxim2016-12-081-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | case of deleted target branch add spec on #24507 bug description add changelog entry fix changelog remove unnecessary js:true from specs change spec title add test for link to target branch before deletions renamed spec about state of target branch link before and after deletion some fixes into spec
* | Merge branch 'group-members-in-project-members-view' into 'master' Sean McGivern2016-12-081-0/+90
|\ \ | | | | | | | | | | | | | | | | | | Shows group members in the project members list Closes #24122 See merge request !7899
| * | Handle an edge-case whith inviteesgroup-members-in-project-members-viewRémy Coutable2016-12-071-7/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the project has invitees, no group members were returned due to a `user_id NOT IN (42, NULL)` query which always returned [] since a `user_id` would be NULL, thus the condition could never match. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Shows group members in the project members listPhil Hughes2016-12-021-0/+21
| | | | | | | | | | | | Closes #24122
* | | Merge branch 'public-tags-api' into 'master' 19703-direct-link-pipelines-into-buildsDouwe Maan2016-12-081-7/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow public access to some Tag API endpoints Continuation of #4269. See merge request !7896
| * | | Allow public access to some Tag API endpointspublic-tags-apiRémy Coutable2016-12-071-7/+48
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '24537-reenable-private-token-with-sudo' into 'master' Douwe Maan2016-12-084-82/+312
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reenables /user API request to return private-token if user is admin and requested with sudo ## What does this MR do? Reenables the API /users to return `private-token` when sudo is either a parameter or passed as a header and the user is admin. ## Screenshots (if relevant) Without **sudo**: ![Screen_Shot_2016-11-21_at_11.44.49](/uploads/ebecf95dbadaf4a159b80c61c75771d9/Screen_Shot_2016-11-21_at_11.44.49.png) With **sudo**: ![Screen_Shot_2016-11-21_at_11.45.52](/uploads/f25f9ddffcf2b921e9694e5a250191d3/Screen_Shot_2016-11-21_at_11.45.52.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24537 See merge request !7615
| * | | adds impersonator variable and makes sudo usage overall more clear24537-reenable-private-token-with-sudotiagonbotelho2016-12-074-82/+312
| | | |
* | | | Merge branch 'fix-visible-content-spec-message' into 'master' Yorick Peterse2016-12-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update outdated visible content spec descriptions This fixes some spec descriptions that were not fixed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7947. See merge request !7971
| * | | | Update outdated visible content spec descriptionsfix-visible-content-spec-messageYorick Peterse2016-12-071-2/+2
| | | | |
* | | | | Merge branch '25399-backup-task-is-not-working-on-8-15-pre' into 'master' Rémy Coutable2016-12-071-0/+127
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Backup::Manager#remove_old Closes #25399 See merge request !7972
| * | | | | Fix Backup::Manager#remove_old25399-backup-task-is-not-working-on-8-15-preSean McGivern2016-12-071-0/+127
| | |/ / / | |/| | |
* | | | | Merge branch 'grapify-issues-api' into 'master' Rémy Coutable2016-12-071-12/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Grapify the issues API Related to #22928 See merge request !7968
| * | | | Grapify the issues APIgrapify-issues-apiRobert Schilling2016-12-071-12/+14
| | | | |
* | | | | Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-071-7/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin hooks spinach to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7942
| * | | | | Move admin hooks spinach to rspecSemyon Pupkov2016-12-061-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-071-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin logs spinach test to RSpec https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !7945
| * | | | | | Move admin logs spinach test to rspecSemyon Pupkov2016-12-061-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | | | Merge branch '25209-improve-length-validators' into 'master' Rémy Coutable2016-12-0711-27/+58
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use :maximum instead of :within for length validators with a 0..N range Closes #25209 See merge request !7894
| * | | | | | Use :maximum instead of :within for length validators with a 0..N range25209-improve-length-validatorsRémy Coutable2016-12-0611-27/+58
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'dz-fix-group-label-404' into 'master' Rémy Coutable2016-12-071-0/+21
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 error when visit group label edit page Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25158 See merge request !7957
| * | | | | Fix 404 error when visit group label edit pagedz-fix-group-label-404Dmitriy Zaporozhets2016-12-061-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'remove-has-visible-content-caching' into 'master' Douwe Maan2016-12-071-29/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove caching of Repository#has_visible_content? This MR removes the caching of `Repository#has_visible_content?`. The cache for this method is no longer necessary and this should solve the problem described in https://gitlab.com/gitlab-org/gitlab-ce/issues/25278. See merge request !7947
| * | | | | Remove caching of Repository#has_visible_content?remove-has-visible-content-cachingYorick Peterse2016-12-061-29/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This method already uses the cached method Repository#branch_count so there's no point in also caching has_visible_content?. Fixes gitlab-org/gitlab-ce#25278
* | | | | Merge branch 'deleted-source-branch-comment' into 'master' Sean McGivern2016-12-061-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Explain "js: true" in "deleted_source_branch_spec.rb" See merge request !7949
| * | | | | Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip]Adam Niedzielski2016-12-061-0/+3
| | | | | |
* | | | | | Merge branch '23589-open-issue-for-mr' into 'master' Sean McGivern2016-12-069-0/+464
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create an issue for all unresolved discussions in an MR See merge request !7180
| * | | | | | Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-059-0/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue.
* | | | | | | Merge branch '24733-archived-project-merge-request-count' into 'master' Sean McGivern2016-12-062-2/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Archived project merge requests add to group's Merge Requests Closes #24733 See merge request !7790
| * | | | | | | Fix Archived project merge requests add to group's Merge RequestsJacopo2016-12-052-2/+39
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counter This is done by: - Extending the IssuableFinder adding the non_archived option to the params - Overriding the #filter_params in the MergeRequestsAction - Passing the non_archived param in the nav/_group.html.haml navbar partial from the groups/merge_requests.html.haml
* | | | | | | Merge branch 'zj-guest-reads-public-builds' into 'master' Sean McGivern2016-12-067-8/+83
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Guests can read builds if those are public See merge request !6842
| * | | | | | Update effected testszj-guest-reads-public-buildsZ.J. van de Weg2016-12-045-43/+44
| | | | | | |
| * | | | | | Guests can read builds if those are publicZ.J. van de Weg2016-12-044-10/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18448
* | | | | | | Merge branch 'refine-ci-statuses' into 'master' Kamil Trzciński2016-12-0612-0/+369
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine CI Statuses ## What does this MR do? This MR introduces classes for each relevant CI status. ## What are the relevant issue numbers? Closes #24273 See merge request !7889
| * | | | | | | Add text example for pipeline status without actionrefine-ci-statusesGrzegorz Bizon2016-12-061-1/+3
| | | | | | | |
| * | | | | | | Expose pipeline detailed status using status factoryGrzegorz Bizon2016-12-051-0/+70
| | | | | | | |
| * | | | | | | Extend tests for pipeline status factoryGrzegorz Bizon2016-12-051-3/+16
| | | | | | | |
| * | | | | | | Implement pipeline status factory with extended statusGrzegorz Bizon2016-12-051-0/+37
| | | | | | | |
| * | | | | | | Fold core/extended status modules to reduce nestingGrzegorz Bizon2016-12-0511-11/+11
| | | | | | | |
| * | | | | | | Implement extended pipeline - status with warningsGrzegorz Bizon2016-12-022-0/+77
| | | | | | | |
| * | | | | | | Add implementation of common pipeline extended statusGrzegorz Bizon2016-12-021-0/+23
| | | | | | | |
| * | | | | | | Add information about badge test to core statusesGrzegorz Bizon2016-12-027-0/+28
| | | | | | | |
| * | | | | | | Add scaffold for remaining statuses-related classesGrzegorz Bizon2016-12-024-0/+0
| | | | | | | |
| * | | | | | | Implement the rest of core CI statuses with specsGrzegorz Bizon2016-12-027-1/+107
| | | | | | | |
| * | | | | | | Add abstract base class for core CI statusGrzegorz Bizon2016-12-021-0/+2
| | | | | | | |
| * | | | | | | Add initial implmentation for core success statusGrzegorz Bizon2016-12-021-0/+11
| | | | | | | |
View Lorry Controller Status