Commit Graph

18 Commits

Author SHA1 Message Date
Sean McGivern 29d8b4ee72 Merge branch '29364-private-projects-mr-fix'
Don’t show source project name when user does not have access

See merge request !2081
2017-04-05 21:06:02 -07:00
Luke "Jared" Bennett 7c5198219a MR empty state 2017-04-05 12:43:03 +00:00
Sanster 4d6e377cd9 fix new MR form erroneously selects tag as source when branch of same name exists #23237 2017-03-24 06:28:21 +08:00
Phil Hughes ef86353ed9 Fixed source branch name not being in new merge request dropdown toggle
Closes #29660
2017-03-20 11:05:32 +00:00
Filipa Lacerda 86558d53dd Adds verification in case the endpoint already has `.json` 2017-02-10 20:00:43 +00:00
Grzegorz Bizon 1c73b764b8 Add feature spec for a new merge request with pipeline 2017-02-07 16:36:29 +01:00
Oswaldo Ferreira f272ee6eba Add shorthand support to gitlab markdown references 2016-12-02 19:18:17 -02:00
Alex Sanford 16a8d64429 Fix regression in Merge request form
Merge request !7163 caused an error message to appear on the Merge
Request form when it was first loaded by the user. This commit fixes
that regression bug.
2016-11-19 11:37:12 -04:00
Stan Hu 0f61bb2dc5
Fix Error 500 when creating a merge request that contains an image that was deleted and added
Steps to reproduce:

1. Start with a repo with an image
2. Add a commit to delete the image
3. Add another commit to replace the image with another image

In a diff comparison, we really just compare about what the image was before the diff, not
the direct parent of the last commit. This MR fixes that.

Closes #3893, gitlab-org/gitlab-ee#678

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-14 15:57:01 +01:00
Alex Sanford 3c2f40cd39 Add validation errors to Merge Request form
If source branch or target branch doesn't exist in the project, display
form validation errors. Previously, this caused a 500 error code.
2016-11-01 07:28:22 -03:00
Ruben Davila 22ce76d447 Refactor to mark Changes tab as active on new MR page. 2016-08-18 07:33:27 -05:00
Alfredo Sumaran bac19f4c5c Fix failing test
Test was not waiting for the page to be fully loaded
2016-08-17 22:55:24 -05:00
Robert Speicher a6a4562872 Merge branch '20808-merge-request-new-diff-view' into 'master'
Fix merge request new view not changing code view rendering style

Correctly respects the code view changing when creating a merge request.

Closes #20808

See merge request !5768
2016-08-17 18:05:40 +00:00
Phil Hughes f668da11cb Updated tests 2016-08-13 00:57:40 -05:00
Paco Guzman bbb019094b Fix merge request new view not changing code view rendering style 2016-08-11 10:02:27 +02:00
Rémy Coutable cd0750e045 Prevent private project name and namespace from leaking in the new MR view
Fixes #15591.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-25 15:32:44 -04:00
Phil Hughes 39ecce05c7 Build fix 2016-04-06 16:25:38 +01:00
Stan Hu 7877138958 Fix creation of merge requests for orphaned branches
Closes #14875
2016-04-04 04:51:05 -07:00