-
- Downloads
Merge branch 'bootstrap'
Conflicts: Gemfile app/views/commits/_commits.html.haml app/views/projects/empty.html.haml
No related branches found
No related tags found
Showing
- Gemfile 1 addition, 0 deletionsGemfile
- Gemfile.lock 6 additions, 4 deletionsGemfile.lock
- app/assets/javascripts/issues.js 10 additions, 10 deletionsapp/assets/javascripts/issues.js
- app/assets/javascripts/merge_requests.js 6 additions, 6 deletionsapp/assets/javascripts/merge_requests.js
- app/assets/javascripts/tree.js 10 additions, 7 deletionsapp/assets/javascripts/tree.js
- app/assets/stylesheets/commits.css.scss 30 additions, 85 deletionsapp/assets/stylesheets/commits.css.scss
- app/assets/stylesheets/common.scss 93 additions, 20 deletionsapp/assets/stylesheets/common.scss
- app/assets/stylesheets/dashboard.scss 0 additions, 30 deletionsapp/assets/stylesheets/dashboard.scss
- app/assets/stylesheets/highlight.black.css.scss 1 addition, 0 deletionsapp/assets/stylesheets/highlight.black.css.scss
- app/assets/stylesheets/highlight.css.scss 6 additions, 0 deletionsapp/assets/stylesheets/highlight.css.scss
- app/assets/stylesheets/issues.css.scss 0 additions, 81 deletionsapp/assets/stylesheets/issues.css.scss
- app/assets/stylesheets/login.scss 41 additions, 0 deletionsapp/assets/stylesheets/login.scss
- app/assets/stylesheets/merge_requests.css.scss 0 additions, 5 deletionsapp/assets/stylesheets/merge_requests.css.scss
- app/assets/stylesheets/notes.css.scss 6 additions, 7 deletionsapp/assets/stylesheets/notes.css.scss
- app/assets/stylesheets/projects.css.scss 125 additions, 450 deletionsapp/assets/stylesheets/projects.css.scss
- app/assets/stylesheets/projects.css.scss.bak 384 additions, 0 deletionsapp/assets/stylesheets/projects.css.scss.bak
- app/assets/stylesheets/projects.css.scss~ 385 additions, 0 deletionsapp/assets/stylesheets/projects.css.scss~
- app/assets/stylesheets/reset_bootstrap.scss 38 additions, 0 deletionsapp/assets/stylesheets/reset_bootstrap.scss
- app/assets/stylesheets/style.scss 0 additions, 802 deletionsapp/assets/stylesheets/style.scss
- app/assets/stylesheets/tags.scss 0 additions, 55 deletionsapp/assets/stylesheets/tags.scss
Loading
| Loading
| @@ -29,6 +29,7 @@ gem "httparty" |
gem "charlock_holmes" | ||
gem "foreman" | ||
gem "omniauth-ldap" | ||
gem 'bootstrap-sass' | ||
group :assets do | ||
gem "sass-rails", "~> 3.1.0" | ||
Loading
| Loading
|
app/assets/stylesheets/login.scss
0 → 100644
app/assets/stylesheets/projects.css.scss.bak
0 → 100644
app/assets/stylesheets/projects.css.scss~
0 → 100644
app/assets/stylesheets/reset_bootstrap.scss
0 → 100644
app/assets/stylesheets/style.scss
deleted
100644 → 0
This diff is collapsed.
app/assets/stylesheets/tags.scss
deleted
100644 → 0
Please register or sign in to comment