Merge branch 'master' of github.com:gitlabhq/gitlabhq

app/controllers/admin/application_settings_controller.rb

app/controllers/ci/application_controller.rb

app/controllers/ci/projects_controller.rb

app/models/application_setting.rb

app/views/admin/application_settings/_form.html.haml

app/views/ci/projects/disabled.html.haml

config/initializers/1_settings.rb

...1005162154_remove_ci_enabled_from_application_settings.rb

db/schema.rb

lib/ci/api/api.rb

lib/ci/api/helpers.rb