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

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb

2015-03-02 16:10:12 -08:00

..

appearances

fix preview appearance

2015-01-13 11:32:14 -08:00

application_settings

Add help_text to help text, login and static error pages.

2015-02-26 12:23:09 -08:00

applications

Use shorter map() syntax

2015-02-15 20:50:53 -07:00

background_jobs

Use Gitlab.config instead of Settings everywhere

2014-10-15 23:01:31 +02:00

broadcast_messages

Upgrade to Font Awesome v4.2

2014-10-03 12:19:24 +02:00

dashboard

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

emails

Create the admin email select box which queries through both projects and groups.

2015-01-09 13:13:10 +01:00

groups

Update path helpers and routes for Rails 4.1.9

2015-02-27 18:21:15 -07:00

hooks

Replace ui-box title with panel-heading

2014-05-29 18:43:21 +03:00

keys

Share the key table between admin and profile resources.

2014-12-30 11:01:30 +01:00

logs

Dry admin logs.

2014-10-06 00:14:46 +02:00

projects

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

services

fix typo

2015-02-27 22:49:40 +01:00

users

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

2015-03-02 16:10:12 -08:00