- 10 Oct, 2015 1 commit
-
-
Stan Hu authored
Closes https://github.com/gitlabhq/gitlabhq/issues/9715
-
- 16 Sep, 2015 1 commit
-
-
Stan Hu authored
Closes #2266
-
- 11 Aug, 2015 2 commits
-
-
Dmitriy Zaporozhets authored
This reverts commit 5daf44b7, reversing changes made to 2f706fbd.
-
Dmitriy Zaporozhets authored
This reverts commit 957e849f, reversing changes made to 6b9dbe9f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 04 Aug, 2015 1 commit
-
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 17 Jul, 2015 1 commit
-
-
Stan Hu authored
Closes #1832
-
- 22 Jun, 2015 3 commits
-
-
Robert Speicher authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Robert Speicher authored
-
- 13 Jun, 2015 1 commit
-
-
Robert Speicher authored
-
- 29 May, 2015 1 commit
-
-
Stan Hu authored
-
- 02 May, 2015 1 commit
-
-
jubianchi authored
-
- 30 Apr, 2015 1 commit
-
-
Douwe Maan authored
-
- 12 Feb, 2015 1 commit
-
-
Jeroen van Baarsen authored
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-
- 06 Feb, 2015 2 commits
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
- 04 Feb, 2015 1 commit
-
-
Jeroen van Baarsen authored
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
-
- 15 Sep, 2014 3 commits
-
-
jubianchi authored
* users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username * MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks * issues * labels * projects
-
Marin Jankovski authored
-
Marin Jankovski authored
-
- 20 Aug, 2014 1 commit
-
-
Robert Schilling authored
-
- 14 Aug, 2014 1 commit
-
-
Robert Schilling authored
-
- 17 Jun, 2014 1 commit
-
-
Dmitriy Zaporozhets authored
-
- 13 May, 2014 2 commits
-
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 11 Apr, 2014 1 commit
-
-
Jeroen van Baarsen authored
-
- 07 Apr, 2014 1 commit
-
-
Stuart Pook authored
Add an optional parameter to list merge requests to restrict the returned merge requests to those that are "opened", "merged" or "closed". By default all merge requests are returned. Note that "all" can be given to explicitly request all merge requests.
-
- 03 Apr, 2014 1 commit
-
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 19 Mar, 2014 1 commit
-
-
Stuart Pook authored
Add method to get the comments for a merge request and document that you can change the status of a merge request.
-
- 10 Mar, 2014 1 commit
-
-
Greg Messner authored
-
- 22 Jan, 2014 2 commits
-
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
* project_with_code -> project * project -> ermpty_project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 14 Oct, 2013 1 commit
-
-
Dmitriy Zaporozhets authored
-
- 22 Sep, 2013 1 commit
-
-
Hiroyuki Sato authored
Refs #5145
-
- 21 Sep, 2013 1 commit
-
-
Hiroyuki Sato authored
Fixes #5144 Refs #4996
-
- 12 Sep, 2013 1 commit
-
-
Hiroyuki Sato authored
-
- 18 Jul, 2013 2 commits
-
-
Izaak Alpert authored
-Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
-
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
-
- 14 May, 2013 1 commit
-
-
Dmitriy Zaporozhets authored
-
- 01 Apr, 2013 1 commit
-
-
Dmitriy Zaporozhets authored
-