summaryrefslogtreecommitdiff
path: root/spec/features/merge_request
Commit message (Collapse)AuthorAgeFilesLines
* Remove reply_to_individual_notes feature flag58644-remove-reply_to_individual_notes-feature-flagHeinrich Lee Yu2019-04-031-12/+1
| | | | Also removes specs related to the flag
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵jarv/dev-to-gitlab-2019-04-02John Jarvis2019-04-021-0/+15
|\ | | | | | | jarv/dev-to-gitlab-2019-04-02
| * Merge branch 'security-2819-xss-resolve-conflicts-branch-name' into 'master'GitLab Release Tools Bot2019-04-021-0/+15
| |\ | | | | | | | | | | | | Fix XSS in resolve conflicts form See merge request gitlab/gitlabhq!2977
| | * Fix XSS in resolve conflicts formPaul Slaughter2019-03-071-0/+15
| | | | | | | | | | | | | | | | | | The issue arose when the branch name contained Vue template JavaScript. The fix is to use `v-pre` which disables Vue compilation in a template.
* | | Extend quick actions dsl50199-quick-actions-refactorAlexandru Croitor2019-03-291-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Extend quick actions dsl to allow specifying model types to which given quick action applies * Rename issuable attribute to noteable in interpret_service.rb * Refactor and reorder quick action specs * Create a shared example spec for each quick action to be used for issue, merge request and commit specs. https://gitlab.com/gitlab-org/gitlab-ce/issues/50199
* | | Remove .wiki and @md-typography mixin in favor of .md and .md-fileDouwe Maan2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the styling for `img:not(.emoji)`` was repeated between `.md:not(.use-csslab):not(.wiki)` (for comments and the Markdown preview), `.documentation.wiki` (for help pages), and `.issuable-details .description .wiki` (for MR and issue descriptions). In these places, we now simply use `.md`. Wherever we use `.md` but don't want this image styling (like wikis and blobs), `.md-file` is added.
* | | Expand discussion when opening link to commentHeinrich Lee Yu2019-03-261-9/+29
|/ / | | | | | | Makes discussion expansion depend on `discussion.expanded`
* | Update merge request widget pipeline blockNathan Friend2019-03-211-0/+113
| | | | | | | | | | | | This commit updates the pipeline block that appears on the merge request page to include information that will be exposed by the API as part of the post-merge pipeline feature.
* | Update pipeline list viewNathan Friend2019-03-201-39/+39
| | | | | | | | | | This commit updates the pipeline page and related components to include new pipeline information added by the post-merge pipeline feature.
* | Fix expand all button not workingPhil Hughes2019-03-111-0/+10
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51737
* | Merge branch 'winh-enable-reply_to_individual_notes' into 'master'Grzegorz Bizon2019-03-071-3/+2
|\ \ | | | | | | | | | | | | | | | | | | Enable reply_to_individual_notes feature flag by default Closes #30299 See merge request gitlab-org/gitlab-ce!25575
| * | 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
|\ \ | |/ |/| | | | | | | | | Expand diff to entire file Closes #19054 See merge request gitlab-org/gitlab-ce!24406
| * Add option to expand diff to full filePhil Hughes2019-03-061-1/+1
| | | | | | | | | | | | The user can also toggle between the diff changes and the full file diff. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ok Add spec Fix ok Fix Add changelog Fix Add memoization a fix
* | Merge branch 'web-ide-default-merge-request' into 'master'Nick Thomas2019-02-281-0/+2
|\ \ | | | | | | | | | | | | Use Web IDE path for merge request edit buttons See merge request gitlab-org/gitlab-ce!25595
| * | 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
|/ | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Replaced part of diff file properties with diff viewerNatalia Tepluhina2019-02-151-0/+5
| | | | | | - replaced file.too_large - replaced file.text - replaced file.collapsed
* CE Port of Multiple merge request approval rulesPaul Slaughter2019-02-131-0/+2
| | | | EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
* 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 ↵Phil Hughes2019-02-071-9/+22
|\ | | | | | | | | | | | | | | | | '52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-view' into 'master' Resolve "Lines changed statistics is not easily visible in MR changes view" Closes #52347 See merge request gitlab-org/gitlab-ce!24569
| * Clearly display diff statistics for MRs52347-lines-changed-statistics-is-not-easily-visible-in-mr-changes-viewSam Bigelow2019-02-061-9/+22
| | | | | | | | | | Put the statistics in the compare-versions header for the entire MR Put them in the file header for each individual file
* | 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 settings Closes #55491 See merge request gitlab-org/gitlab-ce!24460
| * Added dropdown for diff settingsPhil Hughes2019-01-244-3/+15
| | | | | | | | | | | | | | Dropdown includes buttons for tree view rendering mode and buttons for the compare view (inline or side-by-side) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55491
* | 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 request that contains that commit no longer specify which commit they come from" Closes #53950 See merge request gitlab-org/gitlab-ce!24427
| * | Resolve commit comments displayed on a merge requestConstance Okoghenun2019-01-211-1/+1
| | | | | | | | | | | | | | | | | | - Added missing i18n strings - Added changelog entry - Fixed lint errors
| * | 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
| | | | | | | | | | | | | | | Add commit prop to NoteableNote component and pass it from NoteableDiscussion
* | | Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-copRémy Coutable2019-01-241-1/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch ↵Filipa Lacerda2019-01-233-8/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master' Resolve "Changing wording to "Delete" when referring to removing a branch" Closes #25569 See merge request gitlab-org/gitlab-ce!23966
| * | Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-223-8/+8
| | | | | | | | | | | | This is to match `git branch -D <branchname>`
* | | Remove animation from pipeline status icon buttonsNathan Friend2019-01-171-8/+38
| |/ |/| | | | | | | | | | | | | | | The expansion hover animation caused a number of layout headaches; this commit removes the animation and replaces them with hover/active/focus styles. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/42769
* | Fixed transient user merges immediately specPhil Hughes2019-01-161-0/+2
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/9206
* Add config_options|variables to BuildMetadatakamil-refactor-ci-builds-v5Kamil Trzciński2019-01-041-1/+1
| | | | | | | | | | | These are data columns that store runtime configuration of build needed to execute it on runner and within pipeline. The definition of this data is that once used, and when no longer needed (due to retry capability) they can be freely removed. They use `jsonb` on PostgreSQL, and `text` on MySQL (due to lacking support for json datatype on old enough version).
* 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
| |\ | | | | | | | | | | | | [master] Validate projects in MR build service See merge request gitlab/gitlabhq!2678
| | * Validate projects in MR build serviceBob Van Landuyt2018-12-141-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This validates the correct abilities for both projects. Only `read_project` isn't enough: For the `source_project` we validate `create_merge_request_from` this also validates that the user has developer access to the project. For the `target_project` we validate `create_merge_reqeust_in` this also validates that the user has access to the project's repository. To avoid generating diffs for unrelated projects we also validate that the projects are in the same fork network now.
* | | Fix commit SHA not showing in merge request compare dropdownStan Hu2018-12-311-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17011 in GitLab 11.1 refactored the merge request diff comparison functionality but omitted the commit SHA due to a change in the API (truncated_commit_sha -> short_commit_sha). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55822
* | | Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-272-18/+85
|/ / | | | | | | | | | | | | | | | | | | | | This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812, fixes a problem creating a displaying image diff notes when the image is stored in LFS. The main problem was that `Gitlab::Diff::File` was returning an invalid valid in `text?` for this kind of files. It also fixes a rendering problem with other LFS files, like text ones. They LFS pointer shouldn't be shown when LFS is enabled for the project, but they were.
* | Revert "Merge branch 'winh-discussion-header-commented' into 'master'"Winnie Hellmann2018-12-211-8/+0
| | | | | | This reverts merge request !23622
* | 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
| | | | | | | | | | | | | | | | | | When this spec is run in a certain order, there appeared to be a timing issue with opening the "Merge when pipeline succeeds" drop-down menu. We now explicitly wait for any pending requests to complete before clicking the drop-down. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6770
* | Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-131-0/+85
| |
* | Fixed emoji awards not being added to notesPhil Hughes2018-12-111-0/+12
|/ | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55141
* Resolve "Navigating unresolved discussions on Merge Request page"André Luís2018-12-081-3/+15
|
View Lorry Controller Status