James Lopez ad68bc63b5 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import ...

# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb

2016-06-13 12:43:25 +02:00

..

environments

Customize ActionMailer preview path

2016-05-25 16:56:06 -04:00

initializers

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller

2016-06-08 10:31:33 +02:00

locales

Implement new UI for pagination

2016-01-20 21:27:01 -05:00

application.rb

Attempt to fix the user page.

2016-06-01 19:42:49 -06:00

aws.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

boot.rb

Enable the Rubocop DeprecatedClassMethods cop

2016-05-08 15:33:34 -06:00

database.yml.env

Improving the "Environment variables" administration doc

2016-02-01 19:10:46 +01:00

database.yml.mysql

set the collation to utf8_general_ci

2014-08-13 14:45:23 +01:00

database.yml.postgresql

Remove 'socket' example PostgreSQL parameter

2014-07-01 18:27:50 +02:00

dependency_decisions.yml

Add LGPLv2 to license whiltelist

2016-06-07 10:14:18 -07:00

environment.rb

Rails update to 4.2.4

2015-11-25 18:18:44 +02:00

gitlab.teatro.yml

Remove wall_enabled field from Project

2016-05-08 15:47:42 -04:00

gitlab.yml.example

Fix incorrect registry key value

2016-06-10 15:53:56 +02:00

license_finder.yml

Resolve feedback.

2016-06-06 13:39:36 -06:00

mail_room.yml

Don't require Gitlab::Redis in mail_room.yml if it's already defined

2016-06-10 13:44:45 +02:00

newrelic.yml

Revert "Remove newrelic gem. Closes #12860"

2016-02-23 07:25:37 -08:00

resque.yml.example

Add a note that changing example configuration files requires changing omnibus-gitlab.

2015-06-11 15:11:37 +02:00

routes.rb

Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

2016-06-13 12:43:25 +02:00

secrets.yml.example

Groundwork for merging CI into CE

2015-08-25 18:42:46 -07:00

sidekiq.yml.example

bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this

2016-02-18 18:58:51 +00:00

unicorn.rb.example

Fix typos and grammar

2016-02-10 12:43:19 +02:00

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

2014-09-23 17:11:16 +03:00