nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated sass; removed kaminari gem

Browse source
This commit is contained in:
danielgrippi 2011-10-02 12:35:12 -07:00
parent 9672c27232
commit f25707a58e
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -89,9 +89,8 @@ gem 'http_accept_language', :git => 'git://github.com/iain/http_accept_language.
# views # views
gem 'haml', '3.1.2' gem 'haml', '3.1.2'
gem 'kaminari'
gem 'mobile-fu' gem 'mobile-fu'
gem 'sass', '3.1.4' gem 'sass', '3.1.7'
gem 'will_paginate', '3.0.pre2' gem 'will_paginate', '3.0.pre2'
# web # web

7
Gemfile.lock
View file

@ -237,8 +237,6 @@ GEM
json_pure (1.6.1) json_pure (1.6.1)
jwt (0.1.3) jwt (0.1.3)
json (>= 1.2.4) json (>= 1.2.4)
kaminari (0.12.4)
rails (>= 3.0.0)
linecache (0.43) linecache (0.43)
linecache19 (0.5.12) linecache19 (0.5.12)
ruby_core_source (>= 0.1.4) ruby_core_source (>= 0.1.4)
@ -414,7 +412,7 @@ GEM
archive-tar-minitar (>= 0.5.2) archive-tar-minitar (>= 0.5.2)
rubyntlm (0.1.1) rubyntlm (0.1.1)
rubyzip (0.9.4) rubyzip (0.9.4)
sass (3.1.4) sass (3.1.7)
selenium-webdriver (2.7.0) selenium-webdriver (2.7.0)
childprocess (>= 0.2.1) childprocess (>= 0.2.1)
ffi (>= 1.0.7) ffi (>= 1.0.7)
@ -505,7 +503,6 @@ DEPENDENCIES
jasmine (= 1.1.0.rc3) jasmine (= 1.1.0.rc3)
json (= 1.4.6) json (= 1.4.6)
jwt (= 0.1.3) jwt (= 0.1.3)
kaminari
linecache (= 0.43) linecache (= 0.43)
mini_magick (= 3.2) mini_magick (= 3.2)
mobile-fu mobile-fu
@ -531,7 +528,7 @@ DEPENDENCIES
rspec-rails (>= 2.0.0) rspec-rails (>= 2.0.0)
ruby-debug ruby-debug
ruby-debug19 ruby-debug19
sass (= 3.1.4) sass (= 3.1.7)
selenium-webdriver (~> 2.7.0) selenium-webdriver (~> 2.7.0)
settingslogic (= 2.0.6) settingslogic (= 2.0.6)
sod! sod!