From ced3160883dffc1596b8504457533cb62514325a Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Thu, 7 Jun 2012 18:25:21 +0200 Subject: [PATCH] Update gem dependencies to work on rubinius --- Gemfile | 4 +--- Gemfile.lock | 48 ++++++++++++------------------------------------ 2 files changed, 13 insertions(+), 39 deletions(-) diff --git a/Gemfile b/Gemfile index aef003e..377db56 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'omniauth-twitter' gem 'omniauth-github' gem 'kaminari' gem 'airbrake' -gem 'twitter-bootstrap-rails' +gem 'twitter-bootstrap-rails', :git => "git://github.com/seyhunak/twitter-bootstrap-rails.git", :branch => "static" gem 'fog' gem 'simple_form' gem 'redcarpet' @@ -28,7 +28,6 @@ group :assets do end group :development do - gem 'ruby-debug19', :require => false gem 'capistrano' gem 'rvm-capistrano' end @@ -42,7 +41,6 @@ group :test, :development do gem 'guard' gem 'guard-jasmine' gem 'libnotify' - gem 'cane' gem 'tailor' # gem 'jasmine-headless-webkit' # gem 'guard-jasmine-headless-webkit' diff --git a/Gemfile.lock b/Gemfile.lock index b0e0f17..da56e03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: git://github.com/seyhunak/twitter-bootstrap-rails.git + revision: db0b1a64be4f81ec2d2b322d965dfe21614015c4 + branch: static + specs: + twitter-bootstrap-rails (2.0.7) + actionpack (>= 3.1) + railties (>= 3.1) + GEM remote: http://rubygems.org/ specs: @@ -32,12 +41,9 @@ GEM airbrake (3.0.9) activesupport builder - archive-tar-minitar (0.5.2) arel (3.0.0) awesome_print (0.4.0) builder (3.0.0) - cane (1.0.0) - tailor capistrano (2.11.2) highline net-scp (>= 1.0.0) @@ -62,9 +68,6 @@ GEM coffee-script-source execjs coffee-script-source (1.2.0) - columnize (0.3.2) - commonjs (0.2.0) - therubyracer (~> 0.9.9) confstruct (0.2.1) connection_pool (0.1.0) diff-lcs (1.1.3) @@ -126,22 +129,13 @@ GEM jquery-rails (1.0.18) railties (~> 3.0) thor (~> 0.14) - json (1.6.5) + json (1.7.3) json_pure (1.6.5) kaminari (0.13.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) railties (>= 3.0.0) - less (2.0.9) - commonjs (~> 0.2.0) - therubyracer (~> 0.9.9) - less-rails (2.1.7) - actionpack (>= 3.1) - less (~> 2.0.7) libnotify (0.7.2) - libv8 (3.3.10.4) - linecache19 (0.5.12) - ruby_core_source (>= 0.1.4) mail (2.4.1) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -149,7 +143,7 @@ GEM mime-types (1.17.2) multi_json (1.0.4) multipart-post (1.1.5) - mysql2 (0.3.10) + mysql2 (0.3.11) net-scp (1.0.4) net-ssh (>= 1.99.1) net-sftp (2.0.5) @@ -216,17 +210,7 @@ GEM activesupport (>= 3.0) railties (>= 3.0) rspec (~> 2.8.0) - ruby-debug-base19 (0.11.25) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby_core_source (>= 0.1.4) - ruby-debug19 (0.11.6) - columnize (>= 0.3.1) - linecache19 (>= 0.5.11) - ruby-debug-base19 (>= 0.11.19) ruby-hmac (0.4.0) - ruby_core_source (0.1.4) - archive-tar-minitar (>= 0.5.2) rubyzip (0.9.5) rvm-capistrano (1.1.0) capistrano (>= 2.0.0) @@ -254,17 +238,11 @@ GEM tailor (0.1.5) term-ansicolor (>= 1.0.5) term-ansicolor (1.0.7) - therubyracer (0.9.10) - libv8 (~> 3.3.10) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.0.3) - actionpack (>= 3.1) - less-rails (~> 2.1.6) - railties (>= 3.1) tzinfo (0.3.31) uglifier (1.1.0) execjs (>= 0.3.0) @@ -278,7 +256,6 @@ PLATFORMS DEPENDENCIES airbrake awesome_print - cane capistrano capybara carrierwave @@ -304,12 +281,11 @@ DEPENDENCIES rake redcarpet rspec-rails - ruby-debug19 rvm-capistrano sass-rails simple_form simplecov tailor - twitter-bootstrap-rails + twitter-bootstrap-rails! tzinfo uglifier (>= 1.0.3)