deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
gitlabhq/spec
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
..
controllers Rspec fixes 2013-01-04 18:50:31 +02:00
helpers Rspec fixes 2013-01-04 18:50:31 +02:00
lib Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
mailers Bit of cleanup and improving mailer 2012-12-31 19:46:40 +02:00
models Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
observers sidekiq with green tests 2013-01-09 09:14:05 +03:00
requests Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
routing Fix routing specs 2013-01-09 09:47:25 +02:00
support Fixed protected branches and file edit 2013-01-04 21:45:30 +02:00
tasks/gitlab Fix routing issues when navigating over tree, commits etc 2012-12-25 06:14:05 +03:00
workers sidekiq with green tests 2013-01-09 09:14:05 +03:00
factories.rb Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
factories_spec.rb Factories spec refactoring after #1616 2012-10-03 13:33:31 +03:00
seed_project.tar.gz Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
spec_helper.rb sidekiq with green tests 2013-01-09 09:14:05 +03:00