summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-0/+6
|\
| * backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-0/+6
* | Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-t...Douwe Maan2017-06-051-1/+1
|\ \
| * | Increase diff limits to 100 KB for collapse and 200 KB overall31983-increase-merge-request-diff-file-size-limit-for-default-toggle-openingSean McGivern2017-06-021-1/+1
| |/
* | Fix replying to a commit discussion displayed in the context of an MRDouwe Maan2017-06-011-1/+40
|/
* Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-313-4/+40
|\
| * Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-05-263-4/+40
| |\
| | * Update MWPS feature spec per change to remove source branch default.32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-projectBryce Johnson2017-05-251-2/+2
| | * Set up merge request from fork more simply.Bryce Johnson2017-05-241-10/+2
| | * Remove spec from created_from_fork_spec.Bryce Johnson2017-05-241-15/+0
| | * Move spec and add one for merge button not disabled.Bryce Johnson2017-05-241-0/+29
| | * Add spec for disabled Remove source branch checkbox.Bryce Johnson2017-05-231-0/+15
| | * Set merge params to force_remove_source_branch by default.Bryce Johnson2017-05-231-2/+4
| | * Shush rubocop.Bryce Johnson2017-05-221-1/+0
| | * Upgrade Remove Source Branch checkbox UX.Bryce Johnson2017-05-221-0/+14
* | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2621-80/+98
|\ \ \ | |/ /
| * | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-242-1/+3
| |\ \
| | * | Fix specsdm-outdated-system-noteDouwe Maan2017-05-231-1/+1
| | * | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-231-0/+2
| * | | Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master'Douwe Maan2017-05-2417-61/+55
| |\ \ \ | | |/ / | |/| |
| | * | Use wait_for_requests to wait all JS requestwait-for-ajax-handling-all-js-requestsOswaldo Ferreira2017-05-2217-61/+55
| | |/
| * | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-233-16/+10
| |\ \
| | * | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-223-16/+10
| | |/
| * | Fix specs32418-make-link-to-self-less-obviousAnnabel Dunstone Gray2017-05-191-1/+1
| |/
| * Consolidate user avatar Vue logicBryce Johnson2017-05-181-1/+1
| * Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-noteEric Eastwood2017-05-171-0/+28
* | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-171-1/+1
|/
* Wait for all Vue resources to finish in merge immediately specsh-disable-merge-worker-in-specStan Hu2017-05-161-1/+1
* Disable Sidekiq in spec to prevent transient build failuresStan Hu2017-05-161-3/+5
* Fix specsAnnabel Dunstone Gray2017-05-121-1/+1
* Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-1/+1
* Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-095-10/+26
|\
| * Fix specs 2Felipe Artur2017-05-081-3/+3
| * Fix SpecsFelipe Artur2017-05-085-10/+26
* | Merge request widget redesignFatih Acet2017-05-0914-87/+92
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-052-0/+2
|\
| * Add instant comments supportKushal Pandya2017-05-052-0/+2
* | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-1/+1
|/
* Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' Sean McGivern2017-05-031-6/+72
|\
| * Allow commenting on older versions of the diff and comparisons between diff v...dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-6/+72
* | find and match first dropdown before clickingLuke "Jared" Bennett2017-05-031-3/+1
|/
* Better Explore Groups viewLuke "Jared" Bennett2017-05-021-0/+1
* Fixed transient failure related to dropdown animations31615-fix-dropdown-animation-failureLuke "Jared" Bennett2017-04-301-0/+1
* Show correct size when MR diff overflowsSean McGivern2017-04-251-11/+9
* Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master' Douwe Maan2017-04-251-9/+38
|\
| * Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needsEric Eastwood2017-04-241-9/+38
* | Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'Rémy Coutable2017-04-2412-20/+0
|\ \
| * | Unnecessary "include WaitForAjax" and "include ApiHelpers"Jacopo2017-04-2112-20/+0
* | | Merge branch 'dz-fix-spec-filenames-ce' into 'master' Sean McGivern2017-04-241-0/+0
|\ \ \ | |_|/ |/| |
| * | Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ceDmitriy Zaporozhets2017-04-241-0/+0
| |/
View Lorry Controller Status