-
- Downloads
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection
Conflicts: CHANGELOG db/schema.rb
No related branches found
No related tags found
Showing
- CHANGELOG 10 additions, 5 deletionsCHANGELOG
- Gemfile 4 additions, 1 deletionGemfile
- Gemfile.lock 4 additions, 2 deletionsGemfile.lock
- app/assets/images/no_project_icon.png 0 additions, 0 deletionsapp/assets/images/no_project_icon.png
- app/assets/javascripts/application.js.coffee 1 addition, 0 deletionsapp/assets/javascripts/application.js.coffee
- app/assets/javascripts/blob/blob.js.coffee 0 additions, 0 deletionsapp/assets/javascripts/blob/blob.js.coffee
- app/assets/javascripts/blob/edit_blob.js.coffee 44 additions, 0 deletionsapp/assets/javascripts/blob/edit_blob.js.coffee
- app/assets/javascripts/blob/new_blob.js.coffee 21 additions, 0 deletionsapp/assets/javascripts/blob/new_blob.js.coffee
- app/assets/javascripts/calendar.js.coffee 35 additions, 0 deletionsapp/assets/javascripts/calendar.js.coffee
- app/assets/javascripts/project_new.js.coffee 0 additions, 14 deletionsapp/assets/javascripts/project_new.js.coffee
- app/assets/javascripts/project_show.js.coffee 1 addition, 1 deletionapp/assets/javascripts/project_show.js.coffee
- app/assets/stylesheets/application.scss 1 addition, 0 deletionsapp/assets/stylesheets/application.scss
- app/assets/stylesheets/generic/buttons.scss 5 additions, 0 deletionsapp/assets/stylesheets/generic/buttons.scss
- app/assets/stylesheets/generic/calendar.scss 95 additions, 0 deletionsapp/assets/stylesheets/generic/calendar.scss
- app/assets/stylesheets/generic/highlight.scss 4 additions, 4 deletionsapp/assets/stylesheets/generic/highlight.scss
- app/assets/stylesheets/gl_bootstrap.scss 0 additions, 3 deletionsapp/assets/stylesheets/gl_bootstrap.scss
- app/assets/stylesheets/main/mixins.scss 1 addition, 1 deletionapp/assets/stylesheets/main/mixins.scss
- app/assets/stylesheets/main/variables.scss 2 additions, 0 deletionsapp/assets/stylesheets/main/variables.scss
- app/assets/stylesheets/sections/dashboard.scss 4 additions, 0 deletionsapp/assets/stylesheets/sections/dashboard.scss
- app/assets/stylesheets/sections/diff.scss 3 additions, 3 deletionsapp/assets/stylesheets/sections/diff.scss
Loading
Please register or sign in to comment