-
- Downloads
Merge remote-tracking branch 'origin/master' into ci-permissions
# Conflicts: # app/views/projects/builds/index.html.haml
Showing
- CHANGELOG 12 additions, 0 deletionsCHANGELOG
- CONTRIBUTING.md 32 additions, 0 deletionsCONTRIBUTING.md
- GITLAB_WORKHORSE_VERSION 1 addition, 1 deletionGITLAB_WORKHORSE_VERSION
- Gemfile 4 additions, 6 deletionsGemfile
- Gemfile.lock 8 additions, 12 deletionsGemfile.lock
- app/assets/javascripts/api.js.coffee 2 additions, 1 deletionapp/assets/javascripts/api.js.coffee
- app/assets/javascripts/dropzone_input.js.coffee 2 additions, 2 deletionsapp/assets/javascripts/dropzone_input.js.coffee
- app/assets/javascripts/project.js.coffee 16 additions, 0 deletionsapp/assets/javascripts/project.js.coffee
- app/assets/javascripts/project_select.js.coffee 2 additions, 1 deletionapp/assets/javascripts/project_select.js.coffee
- app/assets/stylesheets/framework/buttons.scss 1 addition, 7 deletionsapp/assets/stylesheets/framework/buttons.scss
- app/assets/stylesheets/framework/common.scss 2 additions, 2 deletionsapp/assets/stylesheets/framework/common.scss
- app/assets/stylesheets/framework/header.scss 7 additions, 1 deletionapp/assets/stylesheets/framework/header.scss
- app/assets/stylesheets/framework/nav.scss 86 additions, 0 deletionsapp/assets/stylesheets/framework/nav.scss
- app/assets/stylesheets/pages/explore.scss 0 additions, 8 deletionsapp/assets/stylesheets/pages/explore.scss
- app/assets/stylesheets/pages/groups.scss 19 additions, 1 deletionapp/assets/stylesheets/pages/groups.scss
- app/assets/stylesheets/pages/projects.scss 5 additions, 87 deletionsapp/assets/stylesheets/pages/projects.scss
- app/controllers/admin/application_settings_controller.rb 2 additions, 0 deletionsapp/controllers/admin/application_settings_controller.rb
- app/controllers/admin/spam_logs_controller.rb 17 additions, 0 deletionsapp/controllers/admin/spam_logs_controller.rb
- app/controllers/application_controller.rb 2 additions, 0 deletionsapp/controllers/application_controller.rb
- app/controllers/dashboard/projects_controller.rb 1 addition, 0 deletionsapp/controllers/dashboard/projects_controller.rb
Loading
Please register or sign in to comment