summaryrefslogtreecommitdiff
path: root/spec/features/merge_request
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '59570-merge-quick-action' into 'master'Sean McGivern2019-04-041-68/+2
|\
| * Extract merge quick action to a shared example59570-merge-quick-actionAlexandru Croitor2019-04-031-68/+2
* | Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flagHeinrich Lee Yu2019-04-031-12/+1
|/
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitl...jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-021-0/+15
|\
| * Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'GitLab Release Tools Bot2019-04-021-0/+15
| |\
| | * Fix XSS in resolve conflicts formPaul Slaughter2019-03-071-0/+15
* | | Extend quick actions dsl50199-quick-actions-refactorAlexandru Croitor2019-03-291-14/+43
* | | Remove .wiki and @md-typography mixin in favor of .md and .md-fileDouwe Maan2019-03-261-1/+1
* | | Expand discussion when opening link to commentHeinrich Lee Yu2019-03-261-9/+29
|/ /
* | Update merge request widget pipeline blockNathan Friend2019-03-211-0/+113
* | Update pipeline list viewNathan Friend2019-03-201-39/+39
* | Fix expand all button not workingPhil Hughes2019-03-111-0/+10
* | Merge branch 'winh-enable-reply_to_individual_notes' into 'master'Grzegorz Bizon2019-03-071-3/+2
|\ \
| * | Enable reply_to_individual_notes feature flag by defaultWinnie Hellmann2019-03-061-3/+2
| |/
* | Merge branch 'expand-diff-to-full-file' into 'master'Douwe Maan2019-03-071-1/+1
|\ \ | |/ |/|
| * Add option to expand diff to full filePhil Hughes2019-03-061-1/+1
* | Merge dev master into GitLab.com masterYorick Peterse2019-03-041-1/+5
|\ \ | |/ |/|
| * Arbitrary file read via MergeRequestDiffFrancisco Javier López2019-03-041-1/+5
* | Add suffix for merge request eventShinya Maeda2019-03-011-4/+4
* | Merge branch 'web-ide-default-merge-request' into 'master'Nick Thomas2019-02-281-0/+2
|\ \
| * | Use Web IDE path for merge request edit buttonsPhil Hughes2019-02-271-0/+2
| |/
* | Fix misspellings in app/spec executable linesTakuya Noguchi2019-02-271-1/+1
|/
* Replaced part of diff file properties with diff viewerNatalia Tepluhina2019-02-151-0/+5
* CE Port of Multiple merge request approval rulesPaul Slaughter2019-02-131-0/+2
* Resolve "Override squash commit message"Natalia Tepluhina2019-02-072-7/+7
* Update spec/features/merge_request/user_resolves_conflicts_spec.rbPhil Hughes2019-02-071-0/+2
* Merge branch '52347-lines-changed-statistics-is-not-easily-visible-in-mr-chan...Phil Hughes2019-02-071-9/+22
|\
| * Clearly display diff statistics for MRs52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-viewSam Bigelow2019-02-061-9/+22
* | Add reply to notes to turn into discussionsHeinrich Lee Yu2019-02-061-0/+32
|/
* Merge branch 'diff-settings-dropdown' into 'master'Filipa Lacerda2019-01-254-3/+15
|\
| * Added dropdown for diff settingsPhil Hughes2019-01-244-3/+15
* | Merge branch '53950-commit-comments-displayed-on-a-merge-request' into 'master'56221-spec-features-projects-clusters-gcp_spec-rb-appears-to-be-making-real-google-api-requestsMike Greiling2019-01-241-0/+12
|\ \
| * | Resolve commit comments displayed on a merge requestConstance Okoghenun2019-01-211-1/+1
| * | Added reloading to commit non-diff discussion note specConstance Okoghenun2019-01-181-0/+2
| * | Display "commented" only for commit discussions on merge requestsConstance Okoghenun2019-01-171-0/+10
* | | Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-copRémy Coutable2019-01-241-1/+1
* | | Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-b...Filipa Lacerda2019-01-233-8/+8
|\ \ \ | |_|/ |/| |
| * | Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-223-8/+8
* | | Remove animation from pipeline status icon buttonsNathan Friend2019-01-171-8/+38
| |/ |/|
* | Fixed transient user merges immediately specPhil Hughes2019-01-161-0/+2
|/
* Add config_options|variables to BuildMetadatakamil-refactor-ci-builds-v5Kamil Trzciński2019-01-041-1/+1
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-011-0/+37
|\
| * Merge branch 'security-bvl-fix-cross-project-mr-exposure' into 'master'John Jarvis2019-01-011-0/+37
| |\
| | * Validate projects in MR build serviceBob Van Landuyt2018-12-141-0/+37
* | | Fix commit SHA not showing in merge request compare dropdownStan Hu2018-12-311-0/+11
* | | Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-272-18/+85
|/ /
* | Revert "Merge branch 'winh-discussion-header-commented' into 'master'"Winnie Hellmann2018-12-211-8/+0
* | Add failing test for commit ID in discussion headerWinnie Hellmann2018-12-191-0/+8
* | Resolve a transient failure in MWPS feature specRobert Speicher2018-12-141-0/+2
* | Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-131-0/+85
View Lorry Controller Status