08 Aug, 2013
5 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
4 commits
05 Aug, 2013
2 commits
04 Aug, 2013
3 commits
-
Show autocomplete list when editing notes.
02 Aug, 2013
4 commits
01 Aug, 2013
5 commits
31 Jul, 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
29 Jul, 2013
6 commits
-
…ew. Increased timeout for flash message
27 Jul, 2013
2 commits
18 Jul, 2013
3 commits
17 Jul, 2013
1 commit
-
-The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to. -Removed todo in merge_request, pushed wrapping of grit down to the satellite -updated action test to check flock status, made it nolonger pending -moved all logging on failure to helper method in satellite GITLAB-592 Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75