Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev ... Conflicts: app/views/dashboard/projects.html.haml app/views/layouts/_head_panel.html.haml config/routes.rb		2013-07-02 11:47:09 +03:00
..
environments	Disable threadsafe! for rake tasks	2013-06-13 09:58:03 +03:00
initializers	Enable threadsafe. Preload lib/	2013-06-11 18:03:13 +03:00
locales
application.rb
aws.yml.example
boot.rb
database.yml.mysql	cattr_accessor is not threadsafe!	2013-06-11 18:15:18 +03:00
database.yml.postgresql	cattr_accessor is not threadsafe!	2013-06-11 18:15:18 +03:00
environment.rb
gitlab.yml.example	Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq	2013-07-02 08:43:40 +00:00
puma.rb.example
resque.yml.example
routes.rb	Merge branch 'master' into 6-0-dev	2013-07-02 11:47:09 +03:00