From 185e967a58037ea9ee1b092fdd73d9fef22d7574 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Thu, 6 Mar 2014 10:33:05 +0100 Subject: [PATCH] update gemfile after merge --- Gemfile | 1 - Gemfile.lock | 135 +++------------------------------------------------ 2 files changed, 6 insertions(+), 130 deletions(-) diff --git a/Gemfile b/Gemfile index 332b3961..9f916c51 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,6 @@ gem 'uglifier', '>=1.3.0' gem 'jquery-rails' # Twitter Bootstrap -gem 'therubyracer' gem 'less-rails' gem 'twitter-bootstrap-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 2e96ce7c..2155f14c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,6 @@ GIT remote: https://github.com/cucumber/aruba -<<<<<<< HEAD - revision: 7afbc5c0cbae9c9a946d70c4c2735ccb86e00f08 -======= - revision: 99d8e6a5992af17b014783e775409bc3fd422273 ->>>>>>> master + revision: e4a17189e33f80a93ab75d4f96222048f98efdd2 specs: aruba (0.5.4) childprocess (>= 0.3.6) @@ -17,8 +13,6 @@ GIT specs: actionpack-xml_parser (1.0.1) actionpack (>= 4.0.0, < 5) -<<<<<<< HEAD -======= GIT remote: https://github.com/tolk/tolk @@ -27,43 +21,21 @@ GIT tolk (1.4.00) safe_yaml (~> 0.8) will_paginate ->>>>>>> master GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) -<<<<<<< HEAD - aasm (3.0.25) - actionmailer (4.0.2) - actionpack (= 4.0.2) - mail (~> 2.5.4) - actionpack (4.0.2) - activesupport (= 4.0.2) -======= aasm (3.1.1) actionmailer (4.0.3) actionpack (= 4.0.3) mail (~> 2.5.4) actionpack (4.0.3) activesupport (= 4.0.3) ->>>>>>> master builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) -<<<<<<< HEAD - activemodel (4.0.2) - activesupport (= 4.0.2) - builder (~> 3.1.0) - activerecord (4.0.2) - activemodel (= 4.0.2) - activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.2) - arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) - activesupport (4.0.2) -======= activemodel (4.0.3) activesupport (= 4.0.3) builder (~> 3.1.0) @@ -74,7 +46,6 @@ GEM arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) activesupport (4.0.3) ->>>>>>> master i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) @@ -82,19 +53,11 @@ GEM tzinfo (~> 0.3.37) acts_as_list (0.4.0) activerecord (>= 3.0) -<<<<<<< HEAD - arel (4.0.1) - atomic (1.1.14) - bcrypt-ruby (3.0.1) - builder (3.1.4) - bullet (4.7.1) -======= arel (4.0.2) atomic (1.1.15) bcrypt-ruby (3.0.1) builder (3.1.4) bullet (4.8.0) ->>>>>>> master activesupport uniform_notifier (>= 1.4.0) cache_digests (0.3.1) @@ -108,11 +71,7 @@ GEM xpath (~> 2.0) childprocess (0.5.1) ffi (~> 1.0, >= 1.0.11) -<<<<<<< HEAD - codeclimate-test-reporter (0.2.0) -======= codeclimate-test-reporter (0.3.0) ->>>>>>> master simplecov (>= 0.7.1, < 1.0.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -120,14 +79,9 @@ GEM coffee-script (2.2.0) coffee-script-source execjs -<<<<<<< HEAD - coffee-script-source (1.6.3) - commonjs (0.2.7) - cucumber (1.3.10) -======= coffee-script-source (1.7.0) + commonjs (0.2.7) cucumber (1.3.11) ->>>>>>> master builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) @@ -140,15 +94,6 @@ GEM rails (>= 3.0.0) database_cleaner (1.2.0) diff-lcs (1.2.5) -<<<<<<< HEAD - docile (1.1.1) - erubis (2.7.0) - execjs (2.0.2) - factory_girl (4.3.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.3.0) - factory_girl (~> 4.3.0) -======= docile (1.1.3) erubis (2.7.0) execjs (2.0.2) @@ -156,7 +101,6 @@ GEM activesupport (>= 3.0.0) factory_girl_rails (4.4.1) factory_girl (~> 4.4.0) ->>>>>>> master railties (>= 3.0.0) ffi (1.9.3) gherkin (2.12.2) @@ -165,8 +109,7 @@ GEM hike (1.2.3) htmlentities (4.3.1) i18n (0.6.9) -<<<<<<< HEAD - jquery-rails (3.0.4) + jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -175,42 +118,23 @@ GEM less-rails (2.4.2) actionpack (>= 3.1) less (~> 2.4.0) -======= - jquery-rails (3.1.0) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - json (1.8.1) ->>>>>>> master libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) -<<<<<<< HEAD - metaclass (0.0.1) -======= metaclass (0.0.4) ->>>>>>> master mime-types (1.25.1) mini_portile (0.5.2) minitest (4.7.5) mocha (1.0.0) metaclass (~> 0.0.1) -<<<<<<< HEAD mousetrap-rails (1.4.6) - multi_json (1.8.2) - multi_test (0.0.3) - mysql2 (0.3.14) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - polyglot (0.3.3) -======= - multi_json (1.8.4) + multi_json (1.9.0) multi_test (0.0.3) mysql2 (0.3.15) nokogiri (1.6.1) mini_portile (~> 0.5.0) polyglot (0.3.4) ->>>>>>> master protected_attributes (1.0.5) activemodel (>= 4.0.1, < 5.0) rack (1.5.2) @@ -218,21 +142,6 @@ GEM rack (>= 1.1.3) rack-test (0.6.2) rack (>= 1.0) -<<<<<<< HEAD - rails (4.0.2) - actionmailer (= 4.0.2) - actionpack (= 4.0.2) - activerecord (= 4.0.2) - activesupport (= 4.0.2) - bundler (>= 1.3.0, < 2.0) - railties (= 4.0.2) - sprockets-rails (~> 2.0.0) - rails_autolink (1.1.5) - rails (> 3.1) - railties (4.0.2) - actionpack (= 4.0.2) - activesupport (= 4.0.2) -======= rails (4.0.3) actionmailer (= 4.0.3) actionpack (= 4.0.3) @@ -246,37 +155,23 @@ GEM railties (4.0.3) actionpack (= 4.0.3) activesupport (= 4.0.3) ->>>>>>> master rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.1) ref (1.0.5) -<<<<<<< HEAD - rspec-expectations (2.14.4) -======= rspec-expectations (2.14.5) ->>>>>>> master diff-lcs (>= 1.1.3, < 2.0) rubyzip (1.1.0) safe_yaml (0.9.7) sanitize (2.1.0) nokogiri (>= 1.4.4) -<<<<<<< HEAD - sass (3.2.13) -======= sass (3.2.14) ->>>>>>> master sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) -<<<<<<< HEAD - selenium-webdriver (2.39.0) - childprocess (>= 0.2.5) -======= selenium-webdriver (2.40.0) childprocess (>= 0.5.0) ->>>>>>> master multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) @@ -285,11 +180,7 @@ GEM multi_json simplecov-html (~> 0.8.0) simplecov-html (0.8.0) -<<<<<<< HEAD - sprockets (2.10.1) -======= sprockets (2.11.0) ->>>>>>> master hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -310,26 +201,16 @@ GEM atomic (>= 1.1.7, < 2) tilt (1.4.1) timecop (0.6.3) -<<<<<<< HEAD - tolk (1.4.00) - protected_attributes - safe_yaml (~> 0.8) - will_paginate treetop (1.4.15) polyglot polyglot (>= 0.3.1) - turbolinks (2.1.0) + turbolinks (2.2.1) coffee-rails twitter-bootstrap-rails (2.2.8) actionpack (>= 3.1) execjs rails (>= 3.1) railties (>= 3.1) -======= - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) ->>>>>>> master tzinfo (0.3.38) uglifier (2.4.0) execjs (>= 0.3.0) @@ -382,13 +263,9 @@ DEPENDENCIES swf_fu therubyracer timecop (~> 0.6.2) -<<<<<<< HEAD - tolk + tolk! turbolinks twitter-bootstrap-rails -======= - tolk! ->>>>>>> master uglifier (>= 1.3.0) will_paginate-bootstrap yard