delta/gitlab/gitlab-ce.git/features, branch docker gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'master' into reference_relative_links 2014-01-24T13:02:11+00:00 Marin Jankovski marin@gitlab.com 2014-01-24T13:02:11+00:00 54bcb6cc2a863e10abdd76745d3a0d50c301ab77 Conflicts: spec/models/project_spec.rb 
Conflicts:
	spec/models/project_spec.rb
Use the correct paths. 2014-01-23T15:00:39+00:00 Marin Jankovski marin@gitlab.com 2014-01-23T12:47:54+00:00 d819d0d1f84946bcc0d2c871682c220db6dbd478 






Merge branch 'improve/mr_diff'
2014-01-23T12:38:23+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-01-23T12:38:23+00:00

28e13634dc9318dbd093a4561ee8ea16e1d71460

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





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







Fix public tests
2014-01-23T11:05:34+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-01-23T11:05:34+00:00

418660b9713fbb6bad156dc15fafcc80ecd3e7c0

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Fix project team tests
2014-01-23T11:02:43+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-01-23T11:02:43+00:00

c3270875edd4d381b11401545b100e7b0408d6ef

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Fix MR spinach tests
2014-01-23T10:55:43+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-01-23T10:55:43+00:00

380342784d3efbecb98de81c9b2679e3d720f7c9

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Test if the views behave correctly with reference style relative links.
2014-01-23T10:08:57+00:00

Marin Jankovski
marin@gitlab.com

2014-01-23T10:08:57+00:00

c6b9767e74421bae7f0532ce7fab8753863e94f0












Merge pull request #6075 from skv-headless/remove_deprecated_finders
2014-01-22T19:04:56+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-01-22T19:04:56+00:00

4d56c359d343ba3a1117dfc06034820a415450d3

Remove deprecated finders




Remove deprecated finders






Make changes to tests
2014-01-22T19:03:52+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-01-22T19:03:52+00:00

c227aa44f9c54dd88f2ac8de7a3463a23f516dff

* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





* project_with_code -> project
* project -> ermpty_project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Remove deprecated finders
2014-01-19T19:39:56+00:00

skv
skv-headless@yandex.ru

2014-01-19T18:55:59+00:00

a3f645ef51ec12ce93934b4ddb11313613d8c451