14 Aug, 2013
1 commit
13 Aug, 2013
1 commit
12 Aug, 2013
1 commit
-
So lets do it async. First create project, then import repo and create satellite with Sidekiq
10 Aug, 2013
1 commit
08 Aug, 2013
2 commits
-
Conflicts: app/contexts/filter_context.rb app/contexts/search_context.rb app/models/merge_request.rb app/models/note.rb app/views/shared/_merge_requests.html.haml spec/controllers/commit_controller_spec.rb spec/services/notification_service_spec.rb
07 Aug, 2013
2 commits
06 Aug, 2013
1 commit
17 Jul, 2013
2 commits
-
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
-
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
04 Jul, 2013
1 commit
30 Jun, 2013
1 commit
-
Conflicts: app/controllers/admin/teams/projects_controller.rb app/views/team_members/_team_member.html.haml app/views/teams/members/_member.html.haml
21 Jun, 2013
1 commit
20 Jun, 2013
1 commit
-
fixes #4360.
19 Jun, 2013
1 commit
17 Jun, 2013
1 commit
14 Jun, 2013
1 commit
16 May, 2013
2 commits
14 May, 2013
3 commits
09 May, 2013
2 commits
05 May, 2013
1 commit
03 May, 2013
1 commit
-
initialize_dup has been made private as of ruby 2.0.0. I have corrected it to call the publicly available dup method
02 May, 2013
2 commits
-
updated fork feature to use gitlab-shell for v5 of gitlab
-
When asking to fork a project and a project with the same name already exists (likely from a previous fork), the recovery from the fork failure would inadvertantly delete the repo of the existing destination project.
26 Apr, 2013
1 commit
24 Apr, 2013
1 commit
15 Apr, 2013
1 commit
10 Apr, 2013
1 commit
31 Mar, 2013
3 commits
28 Mar, 2013
1 commit
25 Mar, 2013
2 commits
19 Mar, 2013
1 commit