summaryrefslogtreecommitdiff
path: root/spec/features/merge_request
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Render only one error message per diffFilipa Lacerda2018-04-131-1/+1
| * Fixes unresolved discussions rendering the error state instead of the diffFilipa Lacerda2018-04-121-0/+18
* | Spec improvements for speed, reliability and readabilityBob Van Landuyt2018-04-121-1/+1
* | Prevent awarding emoji when a project is archivedBob Van Landuyt2018-04-111-0/+8
* | Prevent new merge requests for archived projectsBob Van Landuyt2018-04-111-0/+8
|/
* [ci skip] Merge branch 'master' into 42568-pipeline-empty-stateFilipa Lacerda2018-04-041-11/+11
|\
| * Replace the `project/issues/issues.feature` spinach test with an rspec analogblackst0ne2018-04-031-11/+11
* | Properly set up jobs in mini pipeline graph specMatija Čupić2018-04-031-4/+5
|/
* Merge branch 'mr-widget-deployment-styling' into 'master'Filipa Lacerda2018-03-141-1/+1
|\
| * fixed deployment rspecmr-widget-deployment-stylingPhil Hughes2018-03-141-1/+1
* | Resolve "Projects::MergeRequestsController#show is slow (implement skeleton l...Simon Knox2018-03-132-2/+15
|/
* Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-121-0/+6
|\
| * Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwpsEric Eastwood2018-03-081-0/+6
* | added rspec test to test when user cant mergemerge-request-widget-source-branch-improvementsPhil Hughes2018-03-081-0/+24
* | Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-081-1/+1
|/
* Only allow users that can merge to push to sourcebvl-allow-maintainer-to-pushBob Van Landuyt2018-03-071-1/+1
* Limit queries to a user-branch combinationBob Van Landuyt2018-03-071-1/+1
* Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-071-0/+44
* Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+85
* Render MR Notes with Vue with behind a cookieFatih Acet2018-02-281-1/+1
* Merge branch 'master' into fl-mr-widget-1Filipa Lacerda2018-02-012-6/+6
|\
| * Merge branch '36009-user-default-project-creator-in-factories' into 'master'Robert Speicher2018-02-011-1/+1
| |\
| | * Make user/author use project.creator in most factoriesRémy Coutable2018-01-311-1/+1
| * | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-011-5/+5
| |/
* | Update spec to match link being changed into a buttonFilipa Lacerda2018-02-011-1/+1
|/
* Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-241-1/+1
* Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specsRémy Coutable2018-01-1838-0/+4133
View Lorry Controller Status