config · 0d43b9270677106f3aa37112da1dd0482ed40b55 · Forest Godfrey / gitlab-ce

Merge remote-tracking branch 'origin/master' into with-pipeline-view · 7c1acb02

authored May 09, 2016

# Conflicts:
#	app/views/projects/ci/builds/_build.html.haml
#	app/views/projects/commit/_ci_commit.html.haml
#	app/views/projects/commit/_commit_box.html.haml

7c1acb02

Name	Last commit	Last update
..
environments		Loading commit data...
initializers		Loading commit data...
locales		Loading commit data...
application.rb		Loading commit data...
aws.yml.example		Loading commit data...
boot.rb		Loading commit data...
database.yml.env		Loading commit data...
database.yml.mysql		Loading commit data...
database.yml.postgresql		Loading commit data...
environment.rb		Loading commit data...
gitlab.teatro.yml		Loading commit data...
gitlab.yml.example		Loading commit data...
mail_room.yml		Loading commit data...
newrelic.yml		Loading commit data...
resque.yml.example		Loading commit data...
routes.rb		Loading commit data...
secrets.yml.example		Loading commit data...
sidekiq.yml.example		Loading commit data...
unicorn.rb.example		Loading commit data...
unicorn.rb.example.development		Loading commit data...