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

..

backend

Continue refactoring. Use repostory and team

2013-01-04 08:43:25 +02:00

graph

Updated graph tooltips and labels

2013-01-04 13:59:08 +01:00

satellite

Raise exception and show message to user if repo missing satellite

2013-01-05 23:09:26 +02:00

app_logger.rb

Application logger

2012-09-11 23:24:53 +03:00

auth.rb

Update uses of Gitolite.config.foo settings

2012-12-20 16:54:28 +01:00

git_logger.rb

Application logger

2012-09-11 23:24:53 +03:00

git_stats.rb

Improve Commits stats code

2012-11-13 21:26:57 +02:00

inline_diff.rb

fix inline diff

2012-10-04 13:28:58 +03:00

logger.rb

show production.log, show only active milestone for issue filter

2012-12-19 07:14:05 +03:00

markdown.rb

Merge commit 'master' into discussions

2013-01-15 00:52:25 +01:00

project_mover.rb

replaced system() calls with FileUtils.* method

2013-01-03 15:36:50 +01:00

regex.rb

Allow spaces in project name

2012-12-28 09:29:57 +02:00

seeder.rb

Improved seeds for development env

2012-11-13 22:11:56 +02:00

theme.rb

Themes refactored

2012-11-21 18:19:03 +02:00