Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

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

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb

2015-04-24 11:22:54 +03:00

..

admin

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-24 11:22:54 +03:00

audit_events

Fix EE UI for new layout

2014-12-26 15:16:44 +02:00

dashboard

Rename manage_group ability to admin_group for consistency with project.

2015-04-14 12:05:49 +02:00

devise

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-24 11:22:54 +03:00

doorkeeper

Refactor buttons

2015-03-14 00:29:32 -07:00

errors

Improve error page layout

2014-06-24 15:57:38 +03:00

events

Change text of project creation event for imports.

2015-04-06 14:51:41 +02:00

explore

Restyle explore page to sidebar layout

2015-04-22 17:28:44 +03:00

groups

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-15 19:22:57 +03:00

help

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-24 11:22:54 +03:00

import

Improve description of Google Code import user map.

2015-04-21 10:33:04 +02:00

invites

Let invites be declined.

2015-04-14 12:08:11 +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-to-ee

2015-04-24 11:22:54 +03:00

ldap_group_links

Improve UI for sharing project with groups and LDAP groups pages

2015-03-18 19:49:24 -07:00

notify

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-15 19:22:57 +03:00

profiles

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-24 11:22:54 +03:00

projects

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-24 11:22:54 +03:00

search

Refactor buttons

2015-03-14 00:29:32 -07:00

shared

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-24 11:22:54 +03:00

snippets

Fix wording and remove duplicate link

2015-04-22 18:18:11 +03:00

unsubscribes

Use base 64 encoding for email params.

2014-08-22 10:51:33 +02:00

users

Allow user to choose which email to be public

2015-04-14 19:42:48 +08:00

votes

Fix votes inline rendering

2015-03-20 15:34:29 -07:00