gitlab-org--gitlab-foss/lib
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
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
extracts_path.rb
file_size_validator.rb
static_model.rb