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

..

api

Rspec fixes

2013-01-04 18:50:31 +02:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

gitlab

Merge commit 'master' into discussions

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

hooks

sidekiq with green tests

2013-01-09 09:14:05 +03:00

redcarpet/render

Fixed wierd gitlab markdown issue

2012-12-22 14:18:40 +02:00

support

Add subdir support for rewrite-hooks script

2012-12-31 17:46:40 +02:00

tasks

Fix sidekiq chech and added script/check

2013-01-09 20:31:05 +02:00

api.rb

Up API version to v3

2012-12-21 18:55:39 +01:00

event_filter.rb

Added EventFilter class. Compeleted first version of dashbaord filtering

2012-11-05 20:12:26 +02:00

extracts_path.rb

Merge pull request #2484 from netdata/fix_url_encode

2013-01-09 00:35:32 -08:00

file_size_validator.rb

Fully embrace Ruby 1.9 hash syntax

2012-08-10 18:25:15 -04:00

gitolited.rb

more refactoring using models/concerns

2013-01-03 09:06:07 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00