deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
gitlabhq/spec/lib
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
..
auth_spec.rb Be more resilient in the case of missing omniauth settings 2012-09-12 18:11:59 -04:00
extracts_path_spec.rb Fixed styles, ProjectHook specs etc 2013-01-05 00:35:38 +02:00
gitolite_config_spec.rb Split gitolite backend. Use gitolite_config methods moved to separate class 2012-09-07 08:16:29 +03:00
gitolite_spec.rb Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
project_mover_spec.rb Fix api specs. Use id instead path 2013-01-02 19:46:06 +02:00
votes_spec.rb Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00