summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix_issue_from_milestone' into 'master'Rémy Coutable2017-02-133-2/+12
|\
| * fix issue creation from milestone doesn't assign the milestonewendy04022017-02-123-2/+12
* | Merge branch 'concurrent-foreign-keys' into 'master'Rémy Coutable2017-02-132-6/+103
|\ \
| * | Enforce use of add_concurrent_foreign_keyconcurrent-foreign-keysYorick Peterse2017-02-101-0/+33
| * | Add method for creating foreign keys concurrentlyYorick Peterse2017-02-101-6/+70
* | | Merge branch 'rename_files_delete_service' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ | |_|/ |/| |
| * | Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-101-1/+1
* | | convert js-cookie dependency to an npm moduleclean-javascript-vendor-filesMike Greiling2017-02-111-1/+1
* | | convert timeago.js dependency to an npm moduleMike Greiling2017-02-111-1/+1
* | | Fix comment button test for slash commandsAnnabel Dunstone Gray2017-02-101-1/+1
* | | Fix time tracking specAnnabel Dunstone Gray2017-02-101-1/+1
* | | Fix issue boards sidebar alignment and sidebar toggle specAnnabel Dunstone Gray2017-02-101-1/+1
* | | Fix failing conflicts testAnnabel Dunstone Gray2017-02-101-1/+1
* | | Remove fixed positioning from navbarAnnabel Dunstone Gray2017-02-101-1/+1
| |/ |/|
* | Merge branch 'replace-teaspoon-references' into 'master' Clement Ho2017-02-101-1/+1
|\ \
| * | Replace teaspoon references with Karmareplace-teaspoon-referencesClement Ho2017-02-101-1/+1
| |/
* | Merge branch '27963-tooltips-jobs' into 'master' Annabel Dunstone Gray2017-02-101-1/+1
|\ \
| * | Fix broken test to use trigger in order to not take tooltip overlaping in con...Filipa Lacerda2017-02-101-1/+1
* | | Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-103-54/+34
|\ \ \
| * | | Don't perform Devise trackable updates on blocked User recordsrs-warden-blocked-usersRobert Speicher2017-02-103-54/+34
| | |/ | |/|
* | | Merge branch '1051-api-create-users-without-password' into 'master' Rémy Coutable2017-02-101-0/+12
|\ \ \
| * | | Optionally make users created via the API set their passwordJoost Rijneveld2017-02-091-0/+12
* | | | Merge branch '27336-add-environment-url-link-to-terminal-page' into 'master' Kamil Trzciński2017-02-101-0/+16
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | Show parent group members for nested groupdz-nested-groups-members-pageDmitriy Zaporozhets2017-02-103-0/+80
* | | | Merge branch 'issue_27855' into 'master' Rémy Coutable2017-02-101-5/+6
|\ \ \ \
| * | | | 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 validtest-for-current-gitlab-ci-ymlLin Jen-Shin2017-02-101-0/+10
| |/ / / /
* | | | | Merge branch 'rs-issue-27974' into 'master'Rémy Coutable2017-02-102-3/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 dropdownsprotected-branch-dropdown-titlesPhil Hughes2017-01-261-2/+10
* | | | | Merge branch 'revert-0ef587b6' into 'master' Filipa Lacerda2017-02-092-16/+16
|\ \ \ \ \
| * | | | | 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 coprs-gemfetcher-cop-specRobert Speicher2017-02-091-0/+46
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'upgrade-babel-v6' into 'master' Alfredo Sumaran2017-02-091-2/+2
|\ \ \ \ \ \
| * | | | | | 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 Rspecthe-undefined2017-01-161-0/+49
* | | | | | 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 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 UIdz-create-nested-groups-via-uiDmitriy Zaporozhets2017-02-071-1/+18
* | | | | | | Merge branch 'dz-nested-groups-api' into 'master' Dmitriy Zaporozhets2017-02-091-0/+14
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add nested groups to the APIdz-nested-groups-apiDmitriy Zaporozhets2017-02-081-0/+14