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

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

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md

2015-06-08 18:24:34 +02:00

..

admin

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

2015-06-05 11:40:36 +02:00

audit_events

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

2015-05-05 10:18:27 +02:00

dashboard

User should be able to leave group. If not - show him proper message

2015-05-29 14:12:30 +02:00

devise

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

2015-06-05 11:40:36 +02:00

doorkeeper

Plural instead of singular.

2015-04-30 21:10:42 +02:00

errors

Add a page title to every page.

2015-04-30 19:12:15 +02:00

events

Push event: Nest link in strong tag, not vice-versa

2015-06-02 15:05:44 -04:00

explore

Add a page title to every page.

2015-04-30 19:12:15 +02:00

groups

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

2015-06-05 11:40:36 +02:00

help

Render "Enterprise Edition" on help page with dark font.

2015-05-25 17:15:03 +02:00

import

Add a page title to every page.

2015-04-30 19:12:15 +02:00

invites

Add a page title to every page.

2015-04-30 19:12:15 +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-06-08 18:24:34 +02: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-06-05 11:40:36 +02:00

profiles

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

2015-06-05 11:40:36 +02:00

projects

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

2015-06-08 18:24:34 +02:00

search

Consistently refer to MRs as either Accepted or Rejected.

2015-05-25 17:01:14 +02:00

shared

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

2015-06-08 18:24:34 +02:00

snippets

Capitalize "X" in "New X".

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

unsubscribes

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

2015-05-05 10:18:27 +02:00

users

Fix title on user page.

2015-05-01 11:33:54 +02:00

votes

Fix votes inline rendering

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