- 27 Jun, 2016 1 commit
-
-
Z.J. van de Weg authored
-
- 24 Jun, 2016 1 commit
-
-
Rémy Coutable authored
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true The issue was that `MergeRequest#mergeable?` returns false when the CI state is not success and project.only_allow_merge_if_build_succeeds is true. In this case `Projects::MergeRequestsController#merge` would return the `:failed` status when enabling `merge_when_build_succeeds`, thus leading to a weird state and the MR never automatically merged. The fix is to disable the CI state check in the controller safeguard that early return the `:failed` status. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 03 Jun, 2016 4 commits
-
-
Zeger-Jan van de Weg authored
-
Kamil Trzcinski authored
-
James Lopez authored
This reverts commit 3e991230.
-
James Lopez authored
# Conflicts: # app/models/project.rb
-
- 01 Jun, 2016 1 commit
-
-
Sean McGivern authored
Set a `sha` parameter on the MR form. If this doesn't match the HEAD of the source branch when the form is submitted, show a warning (like with a merge conflict) and don't merge the branch.
-
- 30 May, 2016 1 commit
-
-
Grzegorz Bizon authored
See #17478
-
- 19 Apr, 2016 1 commit
-
-
Robert Speicher authored
This invalidates one test, which we've removed.
-
- 12 Apr, 2016 1 commit
-
-
Felipe Artur authored
-
- 11 Apr, 2016 1 commit
-
-
Felipe Artur authored
-
- 30 Mar, 2016 1 commit
-
-
Gabriel Mazetto authored
-
- 21 Mar, 2016 1 commit
-
-
Zeger-Jan van de Weg authored
-
- 19 Mar, 2016 3 commits
-
-
Zeger-Jan van de Weg authored
-
Zeger-Jan van de Weg authored
-
Zeger-Jan van de Weg authored
-
- 18 Feb, 2016 1 commit
-
-
Rubén Dávila authored
-
- 05 Feb, 2016 2 commits
-
-
Robert Speicher authored
-
Rémy Coutable authored
-
- 04 Dec, 2015 1 commit
-
-
Douglas Barbosa Alexandre authored
-
- 13 Nov, 2015 1 commit
-
-
Minsik Yoon authored
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
-
- 23 Jun, 2015 1 commit
-
-
Stan Hu authored
-
- 22 Jun, 2015 1 commit
-
-
Robert Speicher authored
Both work, but now we're consistent across the entire app.
-
- 17 Jun, 2015 2 commits
-
-
Robert Speicher authored
-
Robert Speicher authored
-
- 28 Apr, 2015 1 commit
-
-
Stan Hu authored
Closes #1413
-
- 14 Feb, 2015 1 commit
-
-
Vinnie Okada authored
Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
-
- 12 Feb, 2015 2 commits
-
-
Jeroen van Baarsen authored
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-
Jeroen van Baarsen authored
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-
- 06 Aug, 2014 1 commit
-
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 22 Jan, 2014 1 commit
-
-
Dmitriy Zaporozhets authored
* project_with_code -> project * project -> ermpty_project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 14 Jan, 2014 1 commit
-
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 12 Sep, 2013 1 commit
-
-
Hiroyuki Sato authored
-
- 20 Aug, 2013 1 commit
-
-
Dmitriy Zaporozhets authored
-
- 18 Jul, 2013 1 commit
-
-
Izaak Alpert authored
The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
-
- 23 Jun, 2013 1 commit
-
-
Dmitriy Zaporozhets authored
-
- 07 Apr, 2013 1 commit
-
-
Douglas Huff authored
-
- 01 Apr, 2013 1 commit
-
-
Dmitriy Zaporozhets authored
-
- 15 Jan, 2013 1 commit
-
-
Dmitriy Zaporozhets authored
-
- 04 Jan, 2013 1 commit
-
-
Dmitriy Zaporozhets authored
-