Dmitriy Zaporozhets 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc ...

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

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb

2014-03-21 12:22:43 +02:00

..

admin

remove useless nested form from admin group edit form

2014-03-21 08:26:39 +01:00

dashboard

Show link to public projects for new users.

2014-03-17 13:02:04 +01:00

devise

line break

2014-03-19 14:07:42 +01:00

errors

Replace page_title with page-title. Correct margin for some blocks/layouts

2013-07-13 08:45:48 +03:00

events

Remove unnecessary ago keyword

2013-12-30 14:49:22 +02:00

groups

Show shared projects on Group#show in admin area

2014-03-18 12:29:35 +02:00

help

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7

2014-03-18 11:15:01 +02:00

kaminari/gitlab

Migrate forms and inputs pt1

2013-12-31 02:50:36 +02:00

layouts

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc

2014-03-21 12:22:43 +02:00

notify

SHow group name in access granted email

2014-03-11 13:33:47 +02:00

profiles

Refactor scss

2014-02-20 13:51:22 +02:00

projects

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc

2014-03-21 12:22:43 +02:00

public/projects

Refactor scss

2014-02-20 13:51:22 +02:00

search

Add bottom margin to nav-tabs

2014-02-15 13:41:48 +02:00

shared

Also make the blog https.

2014-03-03 09:28:28 +01:00

snippets

Refactor scss

2014-02-20 13:51:22 +02:00

users

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

users_groups

Allow access to groups with public projects.

2014-02-20 09:26:38 -06:00

votes

Fix votes block. twbs3 progress bars

2014-01-01 22:59:06 +02:00