diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-30 02:45:35 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-30 02:45:35 +0400 |
| commit | 8ebfae9a0770ce1ba5afa121a484f70ab9ce9110 (patch) | |
| tree | 007e2f528ac100b1f1c3478bb32782d8dcbeeb1e /Gemfile.lock | |
| parent | 6572d96bb5468b9cdf17c34aec83224ad1840369 (diff) | |
| parent | b51252e6cac2e413e6e39b53964a57d1b29ac12f (diff) | |
Merge branch 'bootstrap'
Conflicts:
Gemfile
app/views/commits/_commits.html.haml
app/views/projects/empty.html.haml
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 89d92ae4324..a3397477195 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,6 +67,8 @@ GEM awesome_print (0.4.0) bcrypt-ruby (3.0.1) blankslate (2.1.2.4) + bootstrap-sass (1.4.4) + sass-rails (~> 3.1) builder (3.0.0) capybara (1.1.2) mime-types (>= 1.16) @@ -226,12 +228,11 @@ GEM blankslate (>= 2.1.2.3) ffi (~> 1.0.7) rubyzip (0.9.4) - sass (3.1.10) - sass-rails (3.1.4) + sass (3.1.12) + sass-rails (3.1.5) actionpack (~> 3.1.0) railties (~> 3.1.0) - sass (>= 3.1.4) - sprockets (~> 2.0.0) + sass (~> 3.1.10) tilt (~> 1.3.2) seed-fu (2.1.0) activerecord (~> 3.1.0) @@ -299,6 +300,7 @@ DEPENDENCIES autotest autotest-rails awesome_print + bootstrap-sass capybara carrierwave charlock_holmes |