summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Back off the array spreading, bc poltergeist freaks out.Bryce Johnson2016-10-151-3/+3
* | | Merge branch '23167-min-row-height' into 'master' Fatih Acet2016-10-141-1/+1
|\ \ \
| * | | Replace generic table withAnnabel Dunstone Gray2016-10-101-1/+1
| |/ /
* | | Show what time ago a MR was deployedZ.J. van de Weg2016-10-141-0/+26
| |/ |/|
* | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-121-0/+51
|\ \
| * | Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-061-0/+51
| |/
* | Add test that checks actual merge for MWBS featureGrzegorz Bizon2016-10-071-2/+13
* | Improve merge when builds succeeds specs readabilityGrzegorz Bizon2016-10-071-16/+28
|/
* Merge branch 'master' into revert-c676283bPhil Hughes2016-10-041-5/+50
|\
| * Add a /wip slash commandThomas Balthazar2016-10-031-5/+50
* | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-034-13/+196
|\ \ | |/
| * Merge branch '22773-add-comparison-link-to-system-note' into 'master' Dmitriy Zaporozhets2016-10-031-6/+13
| |\
| | * Remove duplicate testMatthewRDodds/gitlab-ce-22773-add-comparison-link-to-system-noteMatthew Dodds2016-10-011-4/+0
| | * Add a spec to verify comparison context inclusion in path when a version is c...Matthew Dodds2016-10-011-2/+13
| * | Small improvements thanks to Robert's feedbackRémy Coutable2016-09-301-15/+3
| * | Take filters in account in issuable countersRémy Coutable2016-09-301-0/+15
| |/
| * Shush rubocop.Bryce Johnson2016-09-141-1/+0
| * Style merge request diff dropdowns & disable comments.Bryce Johnson2016-09-141-3/+12
| * Move write_note into SlashCommandsHelper and update other dependent specsslash-commands-issuable-spec-fixStan Hu2016-09-081-4/+6
| * Merge branch 'dz-bulk-edit-mr' into 'master' Rémy Coutable2016-09-081-0/+132
| |\
| | * Refactor code for bulk update merge requests featuredz-bulk-edit-mrDmitriy Zaporozhets2016-09-081-17/+30
| | * Refactor merge requests bulk update specDmitriy Zaporozhets2016-09-081-52/+60
| | * Make merge requests bulk update workingDmitriy Zaporozhets2016-09-081-0/+111
| * | Improve merge request version featureDmitriy Zaporozhets2016-09-071-5/+5
| * | Add more tests for merge request versions featureDmitriy Zaporozhets2016-09-071-3/+17
| * | Improve merge request version switch/compare dropdownDmitriy Zaporozhets2016-09-071-4/+21
| |/
View Lorry Controller Status