Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments ...

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

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb

2014-03-13 23:11:16 +02:00

..

admin

Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix

2014-03-13 22:36:39 +02:00

dashboard

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01:00

group

Fix group test for new member add procedure

2014-02-13 11:06:35 +02:00

profile

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01:00

project

Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments

2014-03-13 23:11:16 +02:00

public

Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix

2014-03-13 22:36:39 +02:00

shared

Fix diff tests

2014-02-24 12:17:39 +02:00

snippets

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01:00

help.rb

Headers have ids and link to their own id.

2014-02-11 16:23:33 +01:00

user.rb

User pages are visible to users without login

2014-02-11 15:45:30 +01:00