summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Fix MR versions spec25996-Move-award-emoji-out-of-the-discussion-tab-for-MRAnnabel Dunstone Gray2016-12-291-2/+2
* Fix grammar error in text about mentioned issuesGrzegorz Bizon2016-12-281-2/+2
* Replace wording for slash command confirmation messagevictorwu2016-12-261-3/+3
* Removes builds tab from merge requestFilipa Lacerda2016-12-211-4/+4
* Change closes issues reference text on MergeRequest#merge_commit_message to m...Gabriel Gizotti2016-12-161-1/+1
* add feature specs to test toggling of merge commit message between message wi...Gabriel Gizotti2016-12-162-3/+75
* Add feature spec to verify all 4 different states of closing issues message o...Gabriel Gizotti2016-12-161-0/+57
* add link_to_if helper on target_branch link on Merge Request show page for ca...Rydkin Maxim2016-12-081-0/+41
* Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip]Adam Niedzielski2016-12-061-0/+3
* Merge branch 'glm-shorthand-reference' into 'master' Sean McGivern2016-12-061-1/+1
|\
| * Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-021-1/+1
* | Merge branch 'reduce-font-size' into 'master' Jacob Schatz2016-12-051-1/+1
|\ \
| * | Reduce base font sizes across appreduce-font-sizeAnnabel Dunstone Gray2016-12-021-1/+1
| |/
* | Fix tests for allowing merged if pipeline succeededGrzegorz Bizon2016-11-251-2/+2
* | Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-257-14/+72
|\ \ | |/
| * Merge branch 'rephrase-system-notes' into 'master' Robert Speicher2016-11-251-1/+1
| |\
| | * Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-241-1/+1
| * | resloves failed rspec test24780-show-last-updated-or-resolved-in-mr-discussionNur Rony2016-11-231-1/+1
| |/
| * Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern2016-11-212-3/+34
| |\
| | * Warn that branch does not exist instead of saying that there isAdam Niedzielski2016-11-211-0/+30
| | * Hide empty merge request diffs when comparing versionsAdam Niedzielski2016-11-211-3/+4
| * | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-213-9/+36
| |/
* | Rename MWPS in user interface and feature testsGrzegorz Bizon2016-11-211-13/+14
* | Rename MWPS in system notes and related testsGrzegorz Bizon2016-11-211-2/+2
|/
* Fix regression in Merge request formAlex Sanford2016-11-191-0/+7
* makes system notes less intrusive to a conversationless-intrusive-system-noteNur Rony2016-11-172-3/+3
* Fix Error 500 when creating a merge request that contains an image that was d...stanhu/gitlab-ce-fix-error-500-with-mr-imagesStan Hu2016-11-141-0/+10
* Fixed tests for issue boards & diff note resolvingvue2Phil Hughes2016-11-101-2/+0
* Complete and improve specsRémy Coutable2016-11-041-17/+33
* Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-0/+53
* Ensure merge request's "remove branch" accessors return booleans24102-cannot-unselect-remove-source-branch-when-editing-merge-requestRémy Coutable2016-11-031-1/+13
* Add validation errors to Merge Request formAlex Sanford2016-11-011-0/+8
* Fix a failing spec in diff_notes_resolve_spec.rbNick Thomas2016-10-281-4/+6
* Escape quotes in gl_dropdown values to prevent exceptionsAirat Shigapov2016-10-261-0/+17
* Remove use of wait_for_ajax since jQuery was removedsh-fix-ajax-spec-failureStan Hu2016-10-251-3/+0
* Fix the merge request view when source projects or branches are removedNick Thomas2016-10-201-0/+14
* Fix remaining offensesKamil Trzcinski2016-10-181-1/+1
* Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-14/+123
|\
| * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-173-4/+30
| |\
| * | Add more tests to check conflicts resolutionAlfredo Sumaran2016-10-131-49/+96
| * | Improve diff view switching and componentsAlfredo Sumaran2016-10-131-5/+5
| * | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-131-1/+37
| * | Refactor JS codeAlfredo Sumaran2016-10-131-2/+2
| * | Fix editor specSean McGivern2016-10-131-0/+1
| * | Add tests to check if files are resolved with Edit Inline modeAlfredo Sumaran2016-10-131-0/+26
| * | We now support resolving conflicts with ambiguous markersDouwe Maan2016-10-131-1/+0
* | | Fix remaining specs failuresKamil Trzcinski2016-10-181-4/+6
* | | Fix specsKamil Trzcinski2016-10-172-16/+40
* | | Merge commit '7d12683' into 22191-delete-dynamic-envs-mr [ci skip]Kamil Trzcinski2016-10-171-0/+9
|\ \ \ | |_|/ |/| |
| * | Fixes broken testsFilipa Lacerda2016-10-111-0/+9
View Lorry Controller Status