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

Fix 500 error when try to update own profile in admin area

2014-02-25 10:15:43 +02:00

dashboard

Headers have ids and link to their own id.

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

profile

Add email aliases for users

2014-02-13 22:59:39 -06: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

snippets

Remove dir prefix and suffix from tests inside dir.

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

steps

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

support

Add email aliases for users

2014-02-13 22:59:39 -06:00

group.feature

Fixes a bug with group member administration

2014-03-10 22:56:26 -04:00

user.feature

User can leave group from group page.

2014-02-12 15:52:53 +01:00