summaryrefslogtreecommitdiff
path: root/spec/features/merge_request
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mr-legacy-diff-notes' into 'master'Filipa Lacerda2018-09-191-9/+6
|\
| * Re-enable legacy diff notes on merge request diffsPhil Hughes2018-09-171-9/+6
* | Merge branch 'dz-combine-green-buttons' into 'master'Filipa Lacerda2018-09-191-2/+2
|\ \
| * | Unite green buttons under one css classDmitriy Zaporozhets2018-09-191-2/+2
* | | Merge branch 'mr-conflict-specs-enable' into 'master'Tim Zallmann2018-09-191-14/+4
|\ \ \ | |/ / |/| |
| * | Re-enables merge conflicts resolution specPhil Hughes2018-09-111-14/+4
| |/
* | Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault2018-09-171-2/+2
|/
* Merge branch 'lock-unlock-quick-actions' into 'master'Rémy Coutable2018-09-101-0/+0
|\
| * Rename `slash_commands` ~> `quick_actions` in specs filesMehdi Lahmam2018-09-061-0/+0
* | Fixed another rspec about collapsing notes after adding themTim Zallmann2018-09-071-1/+1
* | Fix for RSPec for User PostsTim Zallmann2018-09-071-2/+2
* | Fix for Karma, Static Analysis and RSPec for MR PageTim Zallmann2018-09-071-4/+1
|/
* Ensure the project has a repository in spec/features/merge_request/user_sees_...Rémy Coutable2018-09-051-1/+1
* Feature/new merge breadcrumbsJ.D. Bean2018-09-041-0/+18
* Merge branch 'assert-that-mr-diff-is-highlighted' into 'master'Grzegorz Bizon2018-09-011-1/+2
|\
| * Add spec to ensure MR diffs are highlightedSean McGivern2018-08-291-1/+2
* | Reorganize issues and merge request feature specs in the same folderRémy Coutable2018-08-3015-0/+849
|/
* Merge branch 'security-49085-persistent-xss-rendering' into 'master'José Iván Vargas López2018-08-281-0/+54
|\
| * Escaped html charactersChantal Rollison2018-08-211-0/+54
* | Fix broken spec checking for extinct elementAndré Luís2018-08-081-1/+1
|/
* Squashed commit of the following:Shinya Maeda2018-08-071-0/+226
* Reapply "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'mast...André Luís2018-08-011-2/+3
* Revert "Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master'"André Luís2018-08-011-3/+2
* Merge branch '_acet-fix-spec' into 'master'Tim Zallmann2018-07-201-2/+2
|\
| * Fix one disabled spec of comment posting.Fatih Acet2018-07-201-2/+2
* | Resolve ""Jump to first/next unresolved discussion" jumps to resolved discuss...André Luís2018-07-201-2/+3
|/
* Merge cherry-pick modal specsGeorge Tsiolis2018-07-172-3/+21
* Add spec for closing cherry-pick modal on escape keypressGeorge Tsiolis2018-07-171-2/+2
* Resolve "Rename the `Master` role to `Maintainer`" BackendMark Chao2018-07-1122-27/+27
* Updates from `rubocop -a`Lin Jen-Shin2018-07-091-1/+1
* Enable Capybara/FeatureMethods copWinnie Hellmann2018-07-052-2/+2
* Changes tab VUE refactoringFelipe Artur2018-06-2116-86/+127
* Merge branch 'rs-update-rspec' into 'master'Rémy Coutable2018-06-111-2/+2
|\
| * Make all uses of `fixture_file_upload` use relative pathsRobert Speicher2018-06-071-2/+2
* | Merge branch '47182-use-the-default-strings-of-timeago-js' into 'master'Clement Ho2018-06-071-1/+1
|\ \
| * | Use the default strings of timeago.js for timeagoTakuya Noguchi2018-06-041-1/+1
* | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-071-1/+1
|\ \ \ | |_|/ |/| |
| * | remove all .ico favicon variations, use png alwaysAlexis Reigel2018-06-051-1/+1
| |/
* | Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-012-12/+12
|/
* Fix indentation in user_selects_branches_for_new_mr_spec.rbwinh-new-merge-request-encodingWinnie Hellmann2018-05-251-2/+2
* Add failing test for https://gitlab.com/gitlab-org/gitlab-ce/issues/46627Winnie Hellmann2018-05-251-2/+34
* Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-241-1/+1
|\
| * Add cannot_be_merged_recheck merge_statuslulalala2018-05-171-1/+1
* | Merge branch '45850-close-mr-checkout-modal-on-escape' into 'master'Mike Greiling2018-05-241-0/+24
|\ \
| * | Closes MR check out branch modal with escapeJacopo2018-05-221-0/+24
| |/
* | Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-211-3/+3
|/
* Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-021-20/+12
* Resolve "Text from the diff is showing within a table header inside the discu...Simon Knox2018-04-201-1/+10
* Merge branch '45271-collpased-diff-loading' into 'master'Phil Hughes2018-04-171-0/+17
|\
| * Fix rubocopFilipa Lacerda2018-04-131-1/+0
View Lorry Controller Status