deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
gitlabhq/app
History
Riyad Preukschas db2c15369c Merge branch 'master' into discussions 
Conflicts:
	app/assets/stylesheets/main.scss
	app/models/project.rb
	app/views/notes/_common_form.html.haml
	app/views/notes/_per_line_form.html.haml
	lib/gitlab/markdown.rb
	spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
..
assets Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
contexts Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
controllers Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
decorators fix some glitches in gravatar image url generation 2012-12-07 00:03:13 +04:00
helpers Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
mailers Fix email send on close/reopen issue. Display project name with namespace. remove css style 2012-12-20 23:04:27 +02:00
models Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
observers Fix email send on close/reopen issue. Display project name with namespace. remove css style 2012-12-20 23:04:27 +02:00
roles Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
uploaders Fully embrace Ruby 1.9 hash syntax 2012-08-10 18:25:15 -04:00
views Merge branch 'master' into discussions 2012-12-23 01:03:57 +01:00
workers Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00