Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb

2015-03-25 09:16:09 -07:00

..

environments

Merge pull request #8349 from divineforest/cleanup-assets-compress

2015-03-02 15:23:57 -08:00

initializers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-25 09:16:09 -07:00

locales

Remove signout flash message because it also makes no sense.

2015-03-19 04:26:36 +00:00

application.rb

Allow smb:// links in Markdown text.

2015-03-10 13:32:28 +01:00

aws.yml.example

Init aws support for file storage

2013-05-01 12:41:37 +03:00

boot.rb

init commit

2011-10-09 00:36:38 +03: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

environment.rb

Use similar interface to access gitolite

2012-08-29 00:04:06 +03:00

gitlab.teatro.yml

teatro setup

2014-06-17 11:21:49 +03:00

gitlab.yml.example

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-25 09:16:09 -07:00

newrelic.yml

Add dormant New Relic gem

2014-09-16 17:31:20 +02:00

resque.yml.example

Use sockets to connect to Redis

2014-09-12 14:59:58 +02:00

routes.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-03-21 20:41:10 -07:00

unicorn.rb.example

Revert "Increase timeout for Git-over-HTTP requests."

2015-03-19 18:29:20 -07:00

unicorn.rb.example.development

Increase unicorn timeout to 60 seconds

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