Adapt Gemfile* to what's available in OBS:Server:2.4

This commit is contained in:
Henne Vogelsang 2013-05-15 17:41:19 +02:00 committed by Henne Vogelsang
parent e0ac25c64a
commit 76e9bba6ff
2 changed files with 60 additions and 75 deletions

View file

@ -12,12 +12,12 @@ gem 'mysql2'
# in production environments by default. # in production environments by default.
group :assets do group :assets do
gem 'sass-rails', '~> 3.2.3' gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1' # gem 'coffee-rails', '~> 3.2.1'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes # See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby # gem 'therubyracer', :platforms => :ruby
gem 'uglifier', '>= 1.0.3' # gem 'uglifier', '>= 1.0.3'
end end
gem 'will_paginate' gem 'will_paginate'
@ -28,7 +28,7 @@ gem 'devise'
gem 'cancan' gem 'cancan'
gem "haml" gem "haml"
gem 'bcrypt-ruby', '~> 3.0.0' gem 'bcrypt-ruby', '~> 3.0.0'
gem 'node' #gem 'node'
gem 'paper_trail' gem 'paper_trail'
gem 'formtastic-bootstrap' gem 'formtastic-bootstrap'
gem 'cocoon' gem 'cocoon'

View file

@ -2,12 +2,12 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
Ascii85 (1.0.2) Ascii85 (1.0.2)
actionmailer (3.2.9) actionmailer (3.2.11)
actionpack (= 3.2.9) actionpack (= 3.2.11)
mail (~> 2.4.4) mail (~> 2.4.4)
actionpack (3.2.9) actionpack (3.2.11)
activemodel (= 3.2.9) activemodel (= 3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.4) journey (~> 1.0.4)
@ -15,86 +15,77 @@ GEM
rack-cache (~> 1.2) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.2.1) sprockets (~> 2.2.1)
activemodel (3.2.9) activemodel (3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
builder (~> 3.0.0) builder (~> 3.0.0)
activerecord (3.2.9) activerecord (3.2.11)
activemodel (= 3.2.9) activemodel (= 3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
arel (~> 3.0.2) arel (~> 3.0.2)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.2.9) activeresource (3.2.11)
activemodel (= 3.2.9) activemodel (= 3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
activesupport (3.2.9) activesupport (3.2.11)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
acts_as_commentable_with_threading (1.1.2) acts_as_commentable_with_threading (1.1.3)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (~> 3.0) activesupport (~> 3.0)
awesome_nested_set (>= 2.0) awesome_nested_set (>= 2.0)
afm (0.2.0) afm (0.2.0)
arel (3.0.2) arel (3.0.2)
awesome_nested_set (2.1.5) awesome_nested_set (2.1.6)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
builder (3.0.4) builder (3.0.4)
cancan (1.6.8) cancan (1.6.10)
cocaine (0.4.2) climate_control (0.0.3)
cocoon (1.1.1) activesupport (>= 3.0)
coffee-rails (3.2.2) cocaine (0.5.1)
coffee-script (>= 2.2.0) climate_control (>= 0.0.3, < 1.0)
railties (~> 3.2.0) cocoon (1.1.2)
coffee-script (2.2.0) devise (2.2.4)
coffee-script-source
execjs
coffee-script-source (1.4.0)
devise (2.1.2)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
warden (~> 1.2.1) warden (~> 1.2.1)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.0)
execjs (1.4.0)
multi_json (~> 1.0)
formtastic (2.2.1) formtastic (2.2.1)
actionpack (>= 3.0) actionpack (>= 3.0)
formtastic-bootstrap (2.0.0) formtastic-bootstrap (2.1.1)
formtastic (~> 2.2) formtastic (~> 2.2)
formtastic-bootstrap haml (4.0.2)
haml (3.1.7) tilt
hashery (2.1.0) hashery (2.1.0)
hike (1.2.1) hike (1.2.2)
i18n (0.6.1) i18n (0.6.4)
journey (1.0.4) journey (1.0.4)
jquery-fileupload-rails (0.4.0) jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1) actionpack (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
jquery-rails (2.1.4) jquery-rails (2.2.1)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.7.6) json (1.8.0)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.19) mime-types (1.23)
multi_json (1.5.0) multi_json (1.7.3)
mysql2 (0.3.11) mysql2 (0.3.11)
node (0.0.2)
eventmachine
orm_adapter (0.4.0) orm_adapter (0.4.0)
paper_trail (2.7.0) paper_trail (2.7.1)
activerecord (~> 3.0) activerecord (~> 3.0)
railties (~> 3.0) railties (~> 3.0)
paperclip (3.4.0) paperclip (3.4.1)
activemodel (>= 3.0.0) activemodel (>= 3.0.0)
activerecord (>= 3.0.0) activerecord (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
cocaine (~> 0.4.0) cocaine (~> 0.5.0)
mime-types mime-types
pdf-reader (1.3.0) pdf-reader (1.3.3)
Ascii85 (~> 1.0.0) Ascii85 (~> 1.0.0)
afm (~> 0.2.0) afm (~> 0.2.0)
hashery (~> 2.0) hashery (~> 2.0)
@ -107,30 +98,30 @@ GEM
prawn_rails (0.0.11) prawn_rails (0.0.11)
prawn (>= 0.11.1) prawn (>= 0.11.1)
railties (>= 3.0.0) railties (>= 3.0.0)
rack (1.4.3) rack (1.4.5)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-ssl (1.3.2) rack-ssl (1.3.3)
rack rack
rack-test (0.6.2) rack-test (0.6.2)
rack (>= 1.0) rack (>= 1.0)
rails (3.2.9) rails (3.2.11)
actionmailer (= 3.2.9) actionmailer (= 3.2.11)
actionpack (= 3.2.9) actionpack (= 3.2.11)
activerecord (= 3.2.9) activerecord (= 3.2.11)
activeresource (= 3.2.9) activeresource (= 3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.2.9) railties (= 3.2.11)
railties (3.2.9) railties (3.2.11)
actionpack (= 3.2.9) actionpack (= 3.2.11)
activesupport (= 3.2.9) activesupport (= 3.2.11)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
rake (10.0.3) rake (10.0.4)
rdoc (3.12) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
sass (3.2.5) sass (3.2.5)
@ -143,18 +134,15 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6) sqlite3 (1.3.7)
thor (0.16.0) thor (0.18.1)
tilt (1.3.3) tilt (1.4.1)
transitions (0.1.4) transitions (0.1.8)
treetop (1.4.12) treetop (1.4.12)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
ttfunk (1.0.3) ttfunk (1.0.3)
tzinfo (0.3.35) tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1) warden (1.2.1)
rack (>= 1.0) rack (>= 1.0)
will_paginate (3.0.4) will_paginate (3.0.4)
@ -167,21 +155,18 @@ DEPENDENCIES
bcrypt-ruby (~> 3.0.0) bcrypt-ruby (~> 3.0.0)
cancan cancan
cocoon cocoon
coffee-rails (~> 3.2.1)
devise devise
formtastic-bootstrap formtastic-bootstrap
haml haml
jquery-fileupload-rails jquery-fileupload-rails
jquery-rails jquery-rails
mysql2 mysql2
node
paper_trail paper_trail
paperclip (~> 3.0) paperclip (~> 3.0)
prawn prawn
prawn_rails prawn_rails
rails (= 3.2.9) rails (= 3.2.11)
sass-rails (~> 3.2.3) sass-rails (~> 3.2.3)
sqlite3 sqlite3
transitions transitions
uglifier (>= 1.0.3)
will_paginate will_paginate