14 Aug, 2013
1 commit
10 Aug, 2013
1 commit
08 Aug, 2013
1 commit
-
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
05 Aug, 2013
1 commit
30 Jul, 2013
1 commit
-
Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
27 Jul, 2013
1 commit
18 Jul, 2013
3 commits
-
-If not specified in the gitlab.yml default this setting to false Change-Id: I3551df364498dd84ccbd18c90797522e77159f05
-
Change-Id: I411c7544c7834b00d26e51dc9a6c0396c51bd4f3
-
Change-Id: I73b4aa4c46afd56ae02fb24abcd673c0724547e4
17 Jul, 2013
2 commits
-
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
16 Jul, 2013
2 commits
12 Jul, 2013
2 commits
08 Jul, 2013
5 commits
-
Conflicts: Gemfile Gemfile.lock
04 Jul, 2013
1 commit
02 Jul, 2013
3 commits
-
Conflicts: app/views/dashboard/projects.html.haml app/views/layouts/_head_panel.html.haml config/routes.rb
01 Jul, 2013
1 commit
30 Jun, 2013
3 commits
-
Conflicts: app/controllers/admin/teams/projects_controller.rb app/views/team_members/_team_member.html.haml app/views/teams/members/_member.html.haml
26 Jun, 2013
1 commit
25 Jun, 2013
2 commits
-
whitespaces in gitlab.yml.example
24 Jun, 2013
1 commit
23 Jun, 2013
1 commit
22 Jun, 2013
2 commits
18 Jun, 2013
2 commits
13 Jun, 2013
2 commits
11 Jun, 2013
1 commit