deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
gitlabhq/app/views/merge_requests
History
Riyad Preukschas 3022786948 Merge commit 'master' into discussions 
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
..
show Raise exception and show message to user if repo missing satellite 2013-01-05 23:09:26 +02:00
_filter.html.haml a bit of restyling for issues and merge request lists 2013-01-08 08:14:05 +03:00
_form.html.haml Green button when we create new item, blue when save or some primary action 2013-01-06 00:08:02 +02:00
_head.html.haml Fully embrace Ruby 1.9 hash syntax 2012-08-10 18:25:15 -04:00
_merge_request.html.haml Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
_show.html.haml Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
automerge.js.haml Converted merge_requests.js to coffeescript and updated code 2013-01-05 02:53:34 +01:00
branch_from.js.haml Fix 404 errors on Merge Request -> new 2012-10-31 14:29:42 +02:00
branch_to.js.haml Fix 404 errors on Merge Request -> new 2012-10-31 14:29:42 +02:00
commits.js.haml Converted merge_requests.js to coffeescript and updated code 2013-01-05 02:53:34 +01:00
diffs.html.haml Update notes views to support discussions 2012-12-03 22:51:55 +01:00
diffs.js.haml Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
edit.html.haml Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
index.html.haml a bit of restyling for issues and merge request lists 2013-01-08 08:14:05 +03:00
new.html.haml Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
show.html.haml Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
show.js.haml Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00