Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/project_fork.rb features/steps/project/project_forked_merge_requests.rb features/steps/project/project_issue_tracker.rb features/steps/project/project_markdown_render.rb features/steps/shared/project.rb		2014-01-23 14:38:23 +02:00
..
api	Merge branch 'improve/mr_diff'	2014-01-23 14:38:23 +02:00
assets	move assets from lib directory to vendor	2012-05-29 17:56:48 +05:00
backup	Remove duplication in Backup::Manager	2013-11-06 14:02:28 +01:00
gitlab	Remove deprecated finders	2014-01-19 23:39:56 +04:00
redcarpet/render	Correct check.	2013-11-08 16:34:15 +01:00
support	Update the init.d file to the correct locationof the example defaults file	2014-01-08 22:54:03 +00:00
tasks	Merge pull request #6075 from skv-headless/remove_deprecated_finders	2014-01-22 11:04:56 -08:00
event_filter.rb	Constants in Events looks good now	2013-02-13 15:48:16 +04:00
extracts_path.rb	Fix blob and repo stuff after gitlab_git v3	2013-10-01 18:26:55 +03:00
file_size_validator.rb	Fully embrace Ruby 1.9 hash syntax	2012-08-10 18:25:15 -04:00
static_model.rb	Fixed styles, ProjectHook specs etc	2013-01-05 00:35:38 +02:00