gitlab-org--gitlab-foss/config
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
2013-06-04 18:36:22 +03:00
..
environments Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
initializers Merge pull request #4037 from mitchty/master 2013-05-29 23:28:17 -07:00
locales update devise gem 2013-02-28 21:06:16 +02:00
application.rb Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04: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 cleanup database.yml files 2012-09-27 02:56:20 -07:00
database.yml.postgresql Update database.yml.postgresql 2013-03-24 14:10:32 +04:00
deploy.rb.example deploys under git user 2013-02-20 17:11:41 -04:30
environment.rb Use similar interface to access gitolite 2012-08-29 00:04:06 +03:00
gitlab.yml.example Changed regex to support Jira issue numbering format 2013-05-27 16:51:37 -03:00
puma.rb.example Fixed puma.rb environment setting, no need to specify 'production' in daemon options now 2013-05-09 17:41:00 +01:00
resque.yml.example Allow connection to Redis via unix socket 2013-03-06 22:06:12 +01:00
routes.rb Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 2013-06-04 18:36:22 +03:00