Skip to content

Commit

Permalink
update gems
Browse files Browse the repository at this point in the history
  • Loading branch information
progressbarsk committed Jan 9, 2013
1 parent 6cbaf5a commit a298653
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 62 deletions.
8 changes: 4 additions & 4 deletions Gemfile
View file
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
gem 'rails', '~> 3.2.3'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
# gem 'rails', :git => 'https://github.com/rails/rails.git'

gem 'mysql2'
gem 'rack-ssl', :require => 'rack/ssl'
Expand Down Expand Up @@ -60,12 +60,12 @@ gem 'jquery-rails'
# Refinery CMS
# gem 'refinerycms', '~> 2.0.3' #, :path => 'vendor/refinerycms', :branch => '2-0-stable'
gem 'refinerycms', :path => 'vendor/refinerycms', :branch => 'master'
# gem 'refinerycms', :git => 'git://github.com/refinery/refinerycms.git', :branch => 'master'
gem 'refinerycms-settings', :git => 'git://github.com/refinery/refinerycms-settings.git', :branch => 'master'
# gem 'refinerycms', :git => 'https://github.com/refinery/refinerycms.git', :branch => 'master'
gem 'refinerycms-settings', :git => 'https://github.com/refinery/refinerycms-settings.git', :branch => 'master'

# Specify additional Refinery CMS Extensions here (all optional):
# gem 'refinerycms-i18n', '~> 2.0.0'
gem 'refinerycms-i18n', :git => 'git://github.com/refinery/refinerycms-i18n.git', :branch => 'master'
gem 'refinerycms-i18n', :git => 'https://github.com/refinery/refinerycms-i18n.git', :branch => 'master'
gem 'refinerycms-blog', :path => 'vendor/refinerycms-blog', :branch => 'master'
gem 'refinerycms-inquiries', :path => 'vendor/refinerycms-inquiries', :branch => 'master'
gem 'refinerycms-mailinglists', :path => 'vendor/extensions'
Expand Down
115 changes: 57 additions & 58 deletions Gemfile.lock
View file
@@ -1,5 +1,5 @@
GIT
remote: git://github.com/refinery/refinerycms-i18n.git
remote: https://github.com/refinery/refinerycms-i18n.git
revision: adbef8ae30e122e4f2dad16e558a9bb144d176b6
branch: master
specs:
Expand All @@ -8,21 +8,19 @@ GIT
routing-filter (~> 0.3.0)

GIT
remote: git://github.com/refinery/refinerycms-settings.git
revision: e01a7d23eb2cf472014ccffd8d3b1ce7f084e973
remote: https://github.com/refinery/refinerycms-settings.git
revision: f110f54321b85c2a02548851a6e0eca6d9422d59
branch: master
specs:
refinerycms-settings (2.1.0.dev)
acts_as_indexed (~> 0.7.7)
acts_as_indexed (~> 0.8.1)
refinerycms-core (~> 2.1.0.dev)

PATH
remote: vendor/extensions
specs:
refinerycms-door_statuses (1.0)
acts_as_indexed (~> 0.7)
refinerycms-core (~> 2.1.0.dev)
refinerycms-settings (~> 2.1.0.dev)
refinerycms-fees (1.0)
refinerycms-mailinglists (1.0)
refinerycms-registrations (1.0)
Expand All @@ -32,7 +30,7 @@ PATH
remote: vendor/refinerycms
specs:
refinerycms (2.1.0.dev)
bundler (~> 1.0)
bundler (>= 1.2.2, < 2.0)
refinerycms-authentication (= 2.1.0.dev)
refinerycms-core (= 2.1.0.dev)
refinerycms-dashboard (= 2.1.0.dev)
Expand All @@ -56,19 +54,19 @@ PATH
refinerycms-dashboard (2.1.0.dev)
refinerycms-core (= 2.1.0.dev)
refinerycms-images (2.1.0.dev)
acts_as_indexed (~> 0.7.7)
acts_as_indexed (~> 0.8.0)
dragonfly (~> 0.9.12)
refinerycms-core (= 2.1.0.dev)
refinerycms-pages (2.1.0.dev)
acts_as_indexed (~> 0.7.7)
acts_as_indexed (~> 0.8.0)
awesome_nested_set (~> 2.1.3)
babosa (!= 0.3.6)
friendly_id (~> 4.0.4)
globalize3 (~> 0.2.0)
globalize3 (~> 0.3.0)
refinerycms-core (= 2.1.0.dev)
seo_meta (~> 1.4.0)
refinerycms-resources (2.1.0.dev)
acts_as_indexed (~> 0.7.7)
acts_as_indexed (~> 0.8.0)
dragonfly (~> 0.9.12)
refinerycms-core (= 2.1.0.dev)
refinerycms-testing (2.1.0.dev)
Expand All @@ -95,6 +93,7 @@ PATH
specs:
refinerycms-calendar (2.1.0)
refinerycms-core (~> 2.1.0.dev)
seo_meta (~> 1.4.0)

PATH
remote: vendor/refinerycms-inquiries
Expand All @@ -105,38 +104,38 @@ PATH
refinerycms-settings (~> 2.1.0.dev)

GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
actionmailer (3.2.9)
actionpack (= 3.2.9)
actionmailer (3.2.11)
actionpack (= 3.2.11)
mail (~> 2.4.4)
actionpack (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
actionpack (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.9)
activesupport (= 3.2.9)
activemodel (3.2.11)
activesupport (= 3.2.11)
builder (~> 3.0.0)
activerecord (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activerecord (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activesupport (3.2.9)
activeresource (3.2.11)
activemodel (= 3.2.11)
activesupport (= 3.2.11)
activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
rails (~> 3.0)
acts_as_indexed (0.7.8)
acts_as_indexed (0.8.1)
addressable (2.3.2)
arel (3.0.2)
awesome_nested_set (2.1.5)
Expand Down Expand Up @@ -185,22 +184,22 @@ GEM
multipart-post (~> 1.1)
faye-websocket (0.4.6)
eventmachine (>= 0.12.0)
ffi (1.2.0)
ffi (1.3.0)
filters_spam (0.3)
friendly_id (4.0.9)
globalize3 (0.2.0)
globalize3 (0.3.0)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
paper_trail (~> 2)
guard (1.5.4)
listen (>= 0.4.2)
guard (1.6.1)
listen (>= 0.6.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
guard-rspec (2.3.1)
guard-rspec (2.3.3)
guard (>= 1.1)
rspec (~> 2.11)
guard-spork (1.4.0)
guard-spork (1.4.1)
childprocess (>= 0.2.3)
guard (>= 1.1)
spork (>= 0.8.4)
Expand All @@ -211,15 +210,15 @@ GEM
jquery-rails (2.0.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
json (1.7.6)
launchy (2.1.2)
addressable (~> 2.3)
letter_opener (1.0.0)
launchy (>= 2.0.4)
libwebsocket (0.1.7.1)
addressable
websocket
listen (0.6.0)
listen (0.7.1)
lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
Expand All @@ -230,9 +229,9 @@ GEM
multi_json (1.5.0)
multipart-post (1.1.5)
mysql2 (0.3.11)
nokogiri (1.5.5)
nokogiri (1.5.6)
orm_adapter (0.4.0)
paper_trail (2.6.4)
paper_trail (2.7.0)
activerecord (~> 3.0)
railties (~> 3.0)
poltergeist (1.0.2)
Expand All @@ -246,34 +245,34 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
rack (1.4.1)
rack (1.4.3)
rack-cache (1.2)
rack (>= 0.4)
rack-rewrite (1.3.2)
rack-rewrite (1.3.3)
rack-ssl (1.3.2)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.9)
actionmailer (= 3.2.9)
actionpack (= 3.2.9)
activerecord (= 3.2.9)
activeresource (= 3.2.9)
activesupport (= 3.2.9)
rails (3.2.11)
actionmailer (= 3.2.11)
actionpack (= 3.2.11)
activerecord (= 3.2.11)
activeresource (= 3.2.11)
activesupport (= 3.2.11)
bundler (~> 1.0)
railties (= 3.2.9)
railties (= 3.2.11)
rails-i18n (0.6.6)
i18n (~> 0.5)
rails_autolink (1.0.9)
rails (~> 3.1)
railties (3.2.9)
actionpack (= 3.2.9)
activesupport (= 3.2.9)
railties (3.2.11)
actionpack (= 3.2.11)
activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.2)
rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
routing-filter (0.3.1)
Expand All @@ -282,24 +281,24 @@ GEM
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.1)
rspec-expectations (2.12.0)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.0)
rspec-rails (2.12.0)
rspec-mocks (2.12.1)
rspec-rails (2.12.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
sass (3.2.3)
sass (3.2.5)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.27.1)
selenium-webdriver (2.27.2)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
Expand All @@ -323,7 +322,7 @@ GEM
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
truncate_html (0.5.5)
truncate_html (0.9.1)
tzinfo (0.3.35)
uglifier (1.3.0)
execjs (>= 0.3.0)
Expand All @@ -333,7 +332,7 @@ GEM
webmock (1.9.0)
addressable (>= 2.2.7)
crack (>= 0.1.7)
websocket (1.0.4)
websocket (1.0.6)
will_paginate (3.0.3)
xpath (0.1.4)
nokogiri (~> 1.3)
Expand Down

0 comments on commit a298653

Please sign in to comment.