10 Oct, 2013
2 commits
09 Oct, 2013
3 commits
-
Use proper titles for issues trackers
01 Oct, 2013
2 commits
24 Sep, 2013
2 commits
-
* Render right layout depends on current_user * show sample git username/email when repo is empty * Show extra info when browsing public area * Fixed some tests related to public projects * show comments in read-only for public projects * Remove old public routing
12 Sep, 2013
3 commits
-
* Show new merge request button from compare page * Show message if user selected same branches * Show message if compared branches are the same * Prepend inputs with from/to labels
11 Sep, 2013
1 commit
10 Sep, 2013
1 commit
04 Sep, 2013
1 commit
26 Aug, 2013
1 commit
20 Aug, 2013
5 commits
-
Remove the dependancy of grit from class Network::Graph
19 Aug, 2013
1 commit
-
* call set_iid before validation * make rake task pass event if objects are invalid * show iid in comment event at dashboard
10 Aug, 2013
2 commits
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
06 Aug, 2013
1 commit
04 Aug, 2013
3 commits
03 Aug, 2013
1 commit
31 Jul, 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
29 Jul, 2013
1 commit
27 Jul, 2013
2 commits
-
Added show user name as a tooltip on issue participants list
26 Jul, 2013
1 commit
17 Jul, 2013
4 commits
-
-removed extranious space from new_merge_request_email.text.erb Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
-
Forked MR's will print Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch> Non forked MR's will print Branch <source_branch> -> <target_branch> Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038
-
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
-
-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
