summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' Kamil Trzciński2017-02-101-0/+16
|\ | | | | | | | | | | | | Resolve "Add environment URL link to terminal page" Closes #27336 See merge request !9107
| * Added env external link and light web terminal spec27336-add-environment-url-link-to-terminal-pageLuke "Jared" Bennett2017-02-101-0/+16
| |
* | Merge branch 'dz-nested-groups-members-page' into 'master' Dmitriy Zaporozhets2017-02-103-0/+80
|\ \ | | | | | | | | | | | | Nested groups members page See merge request !9062
| * | Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-103-0/+80
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'issue_27855' into 'master' Rémy Coutable2017-02-101-5/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix admin_labels_spec.rb transient failure Closes #27855 See merge request !9135
| * | | Fix admin_labels_spec.rb transient failureissue_27855Felipe Artur2017-02-101-5/+6
| | | |
* | | | Merge branch 'test-for-current-gitlab-ci-yml' into 'master' Rémy Coutable2017-02-101-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make sure our current .gitlab-ci.yml is valid See merge request !9125
| * | | | Make sure our current .gitlab-ci.yml is validtest-for-current-gitlab-ci-ymlLin Jen-Shin2017-02-101-0/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This could prevent errors described in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8970 Everything we're using right now, should be valid of course.
* | | | Merge branch 'rs-issue-27974' into 'master'Rémy Coutable2017-02-102-3/+24
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Remove a transient failure from spec/requests/api/groups_spec.rb Closes #27974 See merge request !9116
| * | | Remove a transient failure from spec/requests/api/groups_spec.rbrs-issue-27974Robert Speicher2017-02-092-3/+24
| | | |
* | | | Merge branch 'protected-branch-dropdown-titles' into 'master' Jacob Schatz2017-02-101-2/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Added header to protected branches access dropdowns See merge request !8774
| * | | Added header to protected branches access dropdownsprotected-branch-dropdown-titlesPhil Hughes2017-01-261-2/+10
| | | | | | | | | | | | | | | | CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294
* | | | Merge branch 'revert-0ef587b6' into 'master' Filipa Lacerda2017-02-092-16/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Responsive title in diffs inline, side by side, with and without sidebar Closes #25709 See merge request !8707
| * | | | Fix expand_collapse_diffs specsrevert-0ef587b6Annabel Dunstone Gray2017-02-091-6/+6
| | | | |
| * | | | Use a new class to keep old behaviorFilipa Lacerda2017-02-082-16/+16
| | | | |
* | | | | Merge branch 'rs-gemfetcher-cop-spec' into 'master'Sean McGivern2017-02-091-0/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a spec for our custom GemFetcher cop See merge request !9076
| * | | | | Add a spec for our custom GemFetcher coprs-gemfetcher-cop-specRobert Speicher2017-02-091-0/+46
| | |_|_|/ | |/| | |
* | | | | Merge branch 'upgrade-babel-v6' into 'master' Alfredo Sumaran2017-02-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade from Babel 5 to Babel 6 See merge request !9072
| * | | | | fix failing karma testMike Greiling2017-02-091-2/+2
| |/ / / /
* | | | | Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master'Rémy Coutable2017-02-091-0/+49
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Move 'User Snippets' Spinach feature to Rspec See merge request !8574
| * | | | Move 'User Snippets' Spinach feature to Rspecthe-undefined2017-01-161-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves the `snippets/user.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. - Remove Spinach discover snippets feature and steps - Add Rspec feature test
* | | | | Correctly transform an anchor link to GFM when copying itDouwe Maan2017-02-091-0/+2
| | | | |
* | | | | Merge branch 'issue_26701' into 'master'Sean McGivern2017-02-091-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Remove JIRA closed status icon Closes #26701 See merge request !8944
| * | | | Remove JIRA closed status iconissue_26701Felipe Artur2017-02-081-1/+1
| | | | |
* | | | | Merge branch 'dz-create-nested-groups-via-ui' into 'master' Dmitriy Zaporozhets2017-02-091-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow creating nested group via UI See merge request !8786
| * | | | | Allow creating nested group via UIdz-create-nested-groups-via-uiDmitriy Zaporozhets2017-02-071-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'dz-nested-groups-api' into 'master' Dmitriy Zaporozhets2017-02-091-0/+14
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Nested groups API See merge request !9034
| * | | | | Add nested groups to the APIdz-nested-groups-apiDmitriy Zaporozhets2017-02-081-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'dm-add-column-with-default-cop' into 'master' Douwe Maan2017-02-091-0/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cop that checks if add_column_with_default is used with up/down methods See merge request !9077
| * | | | | | Add cop that checks if add_column_with_default is used with up/down methodsDouwe Maan2017-02-081-0/+41
| | | | | | |
* | | | | | | Merge branch 'remove-jquery-ui-datepicker' into 'master' Jacob Schatz2017-02-084-17/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI datepicker See merge request !8421
| * | | | | | | Changed date check testremove-jquery-ui-datepickerPhil Hughes2017-02-061-19/+23
| | | | | | | |
| * | | | | | | Fixed missing edit link clickPhil Hughes2017-02-061-1/+3
| | | | | | | |
| * | | | | | | Fixed some specsPhil Hughes2017-02-064-31/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CHANGELOG item
* | | | | | | | Merge branch 'remove-jquery-ui-sortable' into 'master' Jacob Schatz2017-02-084-17/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed jQuery UI sortable See merge request !8478
| * | | | | | | | Removed jQuery UI sortableremove-jquery-ui-sortablePhil Hughes2017-02-064-17/+32
| |/ / / / / / /
* | | | | | | | Merge branch 'dz-fix-route-rename-descendants' into 'master' Dmitriy Zaporozhets2017-02-081-6/+18
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix route rename descendants if route.name is blank See merge request !9074
| * | | | | | | Fix route rename descendants if route.name is blankDmitriy Zaporozhets2017-02-081-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'bypass-whitelist-for-external-user' into 'master' Robert Speicher2017-02-081-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bypass signup domain validation for external users Closes #25279 See merge request !8575
| * | | | | | | Bypass signup domain validation for external usersReza Mohammadi2017-02-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #25279
* | | | | | | | Merge branch '27756-fix-json-404-response' into 'master' Clement Ho2017-02-081-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010
| * | | | | | | | Remove sleep from testsClement Ho2017-02-081-2/+0
| | | | | | | | |
| * | | | | | | | Add tests27756-fix-json-404-responseAlfredo Sumaran2017-02-071-0/+24
| | | | | | | | |
* | | | | | | | | Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master' Clement Ho2017-02-081-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks for correct key to pass to commit prop. Adds rspec test. Closes #27880 See merge request !9070
| * | | | | | | | | Looks for correct key to pass to commit prop. Adds rspec test.Filipa Lacerda2017-02-081-0/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dz-refactor-full-path' into 'master' Dmitriy Zaporozhets2017-02-084-34/+70
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store group and project full name and full path in routes table See merge request !8979
| * | | | | | | | | | Store group and project full name and full path in routes tabledz-refactor-full-pathDmitriy Zaporozhets2017-02-084-34/+70
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'widget-spec-failure' into 'master' Sean McGivern2017-02-081-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed random merge request widget failure Closes #27806 See merge request !9068
| * | | | | | | | | | Fixed random merge request widget failurePhil Hughes2017-02-081-2/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-084-16/+17
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistent naming for services that delete things See merge request !5803