deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updated gems: haml-rails, carrierwave

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-01 15:09:11 +02:00
parent 5da7424f8d
commit 153a4c142d
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -53,10 +53,10 @@ gem 'enumerize'
gem "kaminari", "~> 0.14.1" gem "kaminari", "~> 0.14.1"
# HAML # HAML
gem "haml-rails", "~> 0.3.5" gem "haml-rails"
# Files attachments # Files attachments
gem "carrierwave", "~> 0.7.1" gem "carrierwave"
# Authorization # Authorization
gem "six" gem "six"

13
Gemfile.lock
View file

@ -99,7 +99,7 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 1.0.0) xpath (~> 1.0.0)
carrierwave (0.7.1) carrierwave (0.8.0)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
celluloid (0.12.4) celluloid (0.12.4)
@ -207,11 +207,12 @@ GEM
guard-spinach (0.0.2) guard-spinach (0.0.2)
guard (>= 1.1) guard (>= 1.1)
spinach spinach
haml (3.1.7) haml (4.0.0)
haml-rails (0.3.5) tilt
haml-rails (0.4)
actionpack (>= 3.1, < 4.1) actionpack (>= 3.1, < 4.1)
activesupport (>= 3.1, < 4.1) activesupport (>= 3.1, < 4.1)
haml (~> 3.1) haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1) railties (>= 3.1, < 4.1)
hashie (1.2.0) hashie (1.2.0)
hike (1.2.1) hike (1.2.1)
@ -466,7 +467,7 @@ DEPENDENCIES
binding_of_caller binding_of_caller
bootstrap-sass (= 2.2.1.1) bootstrap-sass (= 2.2.1.1)
capybara (= 2.0.2) capybara (= 2.0.2)
carrierwave (~> 0.7.1) carrierwave
chosen-rails (= 0.9.8) chosen-rails (= 0.9.8)
coffee-rails (~> 3.2.2) coffee-rails (~> 3.2.2)
colored colored
@ -495,7 +496,7 @@ DEPENDENCIES
growl growl
guard-rspec guard-rspec
guard-spinach guard-spinach
haml-rails (~> 0.3.5) haml-rails
httparty httparty
jquery-atwho-rails (= 0.1.7) jquery-atwho-rails (= 0.1.7)
jquery-rails (= 2.1.3) jquery-rails (= 2.1.3)