21 Oct, 2013
1 commit
09 Oct, 2013
1 commit
10 Sep, 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
04 Aug, 2013
2 commits
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
17 Jul, 2013
1 commit
-
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
13 Jul, 2013
1 commit
23 Jun, 2013
1 commit
01 Apr, 2013
1 commit
31 Mar, 2013
2 commits
03 Feb, 2013
1 commit
27 Jan, 2013
1 commit
-
Prepared diff view for multiple view modes Converted commits.js to coffeescript image info in separate coffeescript file Added swipe view mode Added onion skin viewMode
15 Jan, 2013
1 commit
25 Dec, 2012
1 commit
18 Nov, 2012
1 commit
-
Replaced commit status images (diff_file_*.png) with fontawesome icons
31 Oct, 2012
1 commit
09 Oct, 2012
1 commit
02 Aug, 2012
1 commit
02 Jul, 2012
2 commits
24 Jun, 2012
1 commit
03 Jun, 2012
1 commit
30 May, 2012
2 commits
03 Apr, 2012
1 commit
22 Feb, 2012
1 commit
-
When displaying a diff, the line number always starts at one, even if the first diff is not at the first line Fixes this to display correct line numbering on first diff
15 Feb, 2012
1 commit
14 Feb, 2012
1 commit
12 Feb, 2012
1 commit
25 Jan, 2012
1 commit
12 Jan, 2012
1 commit
28 Dec, 2011
1 commit
27 Dec, 2011
2 commits
-
…e deleted a character by mistake...
-
2/ @commit.safe_message as an argument 3/ preserve in helper 4/ spaces around operators
26 Dec, 2011
1 commit
-
It matches #[0-9]+ in commit messages. For example * Fix for #12 * Code review for #56 * Test for #15, Review on #54, Fix for #42 It only links to valid issues (existing and belonging to the current project) It does not add any link to the commit in the issue page, it only consists in parsing the commit message when displayed. This can be considere as a primary work for the issue #155 on gitlabhq/gitlabhq.
13 Dec, 2011
1 commit