From 2a165046b5e1bc32ccb5930be76be10c6d80d7fb Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 30 Dec 2012 21:28:42 +0100 Subject: Updated some gems. --- Gemfile.lock | 113 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 57 insertions(+), 56 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index f9a6596..696166f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,95 +28,95 @@ GEM activesupport (3.2.2) i18n (~> 0.6) multi_json (~> 1.0) - acts_as_list (0.1.5) - addressable (2.2.7) + acts_as_list (0.1.9) + addressable (2.3.2) arel (3.0.2) bcrypt-ruby (3.0.1) - breadcrumbs_on_rails (2.2.0) - builder (3.0.0) - cancan (1.6.7) - carrierwave (0.5.8) - activesupport (~> 3.0) - chunky_png (1.2.5) + breadcrumbs_on_rails (2.3.0) + builder (3.0.4) + cancan (1.6.8) + carrierwave (0.7.1) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + chunky_png (1.2.6) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.2.0) - compass (0.12.rc.1) + coffee-script-source (1.4.0) + compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.0.rc.3) - compass (~> 0.12.rc.0) + compass-rails (1.0.3) + compass (>= 0.12.2, < 0.14) cookiejar (0.3.0) - delayed_job (3.0.1) + delayed_job (3.0.4) activesupport (~> 3.0) - delayed_job_active_record (0.3.2) - activerecord (> 2.1.0) - delayed_job (~> 3.0.0) - em-http-request (1.0.1) + delayed_job_active_record (0.3.3) + activerecord (>= 2.1.0, < 4) + delayed_job (~> 3.0) + em-http-request (1.0.3) addressable (>= 2.2.3) cookiejar em-socksify eventmachine (>= 1.0.0.beta.4) http_parser.rb (>= 0.5.3) - em-socksify (0.1.0) - eventmachine + em-socksify (0.2.1) + eventmachine (>= 1.0.0.beta.4) erubis (2.7.0) - eventmachine (1.0.0.beta.4) - execjs (1.3.0) + eventmachine (1.0.0) + execjs (1.4.0) multi_json (~> 1.0) - factory_girl (2.6.1) - activesupport (>= 2.3.9) - factory_girl_rails (1.7.0) - factory_girl (~> 2.6.0) + factory_girl (4.1.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.1.0) + factory_girl (~> 4.1.0) railties (>= 3.0.0) - faye (0.8.0) + faye (0.8.6) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) eventmachine (>= 0.12.0) faye-websocket (>= 0.4.0) rack (>= 1.0.0) yajl-ruby (>= 1.0.0) - faye-websocket (0.4.1) + faye-websocket (0.4.6) eventmachine (>= 0.12.0) - fssm (0.2.8.1) + fssm (0.2.9) haml (3.1.7) hike (1.2.1) - hirb (0.6.1) + hirb (0.7.0) http_accept_language (1.0.2) http_parser.rb (0.5.3) - i18n (0.6.0) - journey (1.0.3) - jquery-rails (2.0.1) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.6.5) - libv8 (3.3.10.4) + i18n (0.6.1) + journey (1.0.4) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.5) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.3) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.17.2) + mime-types (1.19) mini_magick (3.4) subexec (~> 0.2.1) - multi_json (1.1.0) + multi_json (1.5.0) mysql2 (0.3.11) - nokogiri (1.5.5) + nokogiri (1.5.6) polyglot (0.3.3) - private_pub (1.0.1) + private_pub (1.0.3) faye rack (1.4.1) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) rails (3.2.2) actionmailer (= 3.2.2) @@ -137,38 +137,39 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (0.9.2.2) + rake (10.0.3) rdoc (3.12) json (~> 1.4) + ref (1.0.2) ruby-graphviz (0.9.21) - sass (3.1.15) - sass-rails (3.2.4) + sass (3.2.4) + sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.1.2) + sprockets (2.1.3) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) + sqlite3 (1.3.6) state_machine (1.1.2) - subexec (0.2.1) - systemu (2.5.1) - therubyracer (0.9.10) - libv8 (~> 3.3.10) + subexec (0.2.2) + systemu (2.5.2) + therubyracer (0.11.0) + ref thor (0.14.6) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) - uglifier (1.2.3) + tzinfo (0.3.35) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (>= 1.0.2) - uuid (2.3.5) + multi_json (~> 1.0, >= 1.0.2) + uuid (2.3.6) macaddr (~> 1.0) will_paginate (3.0.3) yajl-ruby (1.1.0) -- cgit v1.2.3 From 4e716cea253be9293b247fbe74d25fe288b7853f Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 30 Dec 2012 22:03:10 +0100 Subject: Converted Factory to FactoryGirl. --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 696166f..9336fe9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,8 +50,8 @@ GEM chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + compass-rails (1.0.0.rc.3) + compass (~> 0.12.rc.0) cookiejar (0.3.0) delayed_job (3.0.4) activesupport (~> 3.0) -- cgit v1.2.3 From 648f51a0ac97675d6cdf6a4b0c3c75bc9ea23168 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 30 Dec 2012 22:04:51 +0100 Subject: Undo the last commit. --- Gemfile.lock | 113 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 56 insertions(+), 57 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 696166f..f9a6596 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,95 +28,95 @@ GEM activesupport (3.2.2) i18n (~> 0.6) multi_json (~> 1.0) - acts_as_list (0.1.9) - addressable (2.3.2) + acts_as_list (0.1.5) + addressable (2.2.7) arel (3.0.2) bcrypt-ruby (3.0.1) - breadcrumbs_on_rails (2.3.0) - builder (3.0.4) - cancan (1.6.8) - carrierwave (0.7.1) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - chunky_png (1.2.6) + breadcrumbs_on_rails (2.2.0) + builder (3.0.0) + cancan (1.6.7) + carrierwave (0.5.8) + activesupport (~> 3.0) + chunky_png (1.2.5) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) - compass (0.12.2) + coffee-script-source (1.2.0) + compass (0.12.rc.1) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.3) - compass (>= 0.12.2, < 0.14) + compass-rails (1.0.0.rc.3) + compass (~> 0.12.rc.0) cookiejar (0.3.0) - delayed_job (3.0.4) + delayed_job (3.0.1) activesupport (~> 3.0) - delayed_job_active_record (0.3.3) - activerecord (>= 2.1.0, < 4) - delayed_job (~> 3.0) - em-http-request (1.0.3) + delayed_job_active_record (0.3.2) + activerecord (> 2.1.0) + delayed_job (~> 3.0.0) + em-http-request (1.0.1) addressable (>= 2.2.3) cookiejar em-socksify eventmachine (>= 1.0.0.beta.4) http_parser.rb (>= 0.5.3) - em-socksify (0.2.1) - eventmachine (>= 1.0.0.beta.4) + em-socksify (0.1.0) + eventmachine erubis (2.7.0) - eventmachine (1.0.0) - execjs (1.4.0) + eventmachine (1.0.0.beta.4) + execjs (1.3.0) multi_json (~> 1.0) - factory_girl (4.1.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.1.0) - factory_girl (~> 4.1.0) + factory_girl (2.6.1) + activesupport (>= 2.3.9) + factory_girl_rails (1.7.0) + factory_girl (~> 2.6.0) railties (>= 3.0.0) - faye (0.8.6) + faye (0.8.0) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) eventmachine (>= 0.12.0) faye-websocket (>= 0.4.0) rack (>= 1.0.0) yajl-ruby (>= 1.0.0) - faye-websocket (0.4.6) + faye-websocket (0.4.1) eventmachine (>= 0.12.0) - fssm (0.2.9) + fssm (0.2.8.1) haml (3.1.7) hike (1.2.1) - hirb (0.7.0) + hirb (0.6.1) http_accept_language (1.0.2) http_parser.rb (0.5.3) - i18n (0.6.1) - journey (1.0.4) - jquery-rails (2.1.4) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - json (1.7.5) + i18n (0.6.0) + journey (1.0.3) + jquery-rails (2.0.1) + railties (>= 3.2.0, < 5.0) + thor (~> 0.14) + json (1.6.5) + libv8 (3.3.10.4) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.4) + mail (2.4.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) + mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) - multi_json (1.5.0) + multi_json (1.1.0) mysql2 (0.3.11) - nokogiri (1.5.6) + nokogiri (1.5.5) polyglot (0.3.3) - private_pub (1.0.3) + private_pub (1.0.1) faye rack (1.4.1) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.2) + rack-test (0.6.1) rack (>= 1.0) rails (3.2.2) actionmailer (= 3.2.2) @@ -137,39 +137,38 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (10.0.3) + rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - ref (1.0.2) ruby-graphviz (0.9.21) - sass (3.2.4) - sass-rails (3.2.5) + sass (3.1.15) + sass-rails (3.2.4) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.1.3) + sprockets (2.1.2) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) + sqlite3 (1.3.5) state_machine (1.1.2) - subexec (0.2.2) - systemu (2.5.2) - therubyracer (0.11.0) - ref + subexec (0.2.1) + systemu (2.5.1) + therubyracer (0.9.10) + libv8 (~> 3.3.10) thor (0.14.6) tilt (1.3.3) - treetop (1.4.12) + treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.35) - uglifier (1.3.0) + tzinfo (0.3.32) + uglifier (1.2.3) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) - uuid (2.3.6) + multi_json (>= 1.0.2) + uuid (2.3.5) macaddr (~> 1.0) will_paginate (3.0.3) yajl-ruby (1.1.0) -- cgit v1.2.3 From 9f14a9a6573db607b79124524088803812454515 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 30 Dec 2012 22:15:58 +0100 Subject: Upgraded FactoryGirl gem --- Gemfile.lock | 105 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 52 insertions(+), 53 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 9336fe9..4e2ff46 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,95 +28,95 @@ GEM activesupport (3.2.2) i18n (~> 0.6) multi_json (~> 1.0) - acts_as_list (0.1.9) - addressable (2.3.2) + acts_as_list (0.1.5) + addressable (2.2.7) arel (3.0.2) bcrypt-ruby (3.0.1) - breadcrumbs_on_rails (2.3.0) - builder (3.0.4) - cancan (1.6.8) - carrierwave (0.7.1) - activemodel (>= 3.2.0) - activesupport (>= 3.2.0) - chunky_png (1.2.6) + breadcrumbs_on_rails (2.2.0) + builder (3.0.0) + cancan (1.6.7) + carrierwave (0.5.8) + activesupport (~> 3.0) + chunky_png (1.2.5) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) - compass (0.12.2) + coffee-script-source (1.2.0) + compass (0.12.rc.1) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) compass-rails (1.0.0.rc.3) compass (~> 0.12.rc.0) cookiejar (0.3.0) - delayed_job (3.0.4) + delayed_job (3.0.1) activesupport (~> 3.0) - delayed_job_active_record (0.3.3) - activerecord (>= 2.1.0, < 4) - delayed_job (~> 3.0) - em-http-request (1.0.3) + delayed_job_active_record (0.3.2) + activerecord (> 2.1.0) + delayed_job (~> 3.0.0) + em-http-request (1.0.1) addressable (>= 2.2.3) cookiejar em-socksify eventmachine (>= 1.0.0.beta.4) http_parser.rb (>= 0.5.3) - em-socksify (0.2.1) - eventmachine (>= 1.0.0.beta.4) + em-socksify (0.1.0) + eventmachine erubis (2.7.0) - eventmachine (1.0.0) - execjs (1.4.0) + eventmachine (1.0.0.beta.4) + execjs (1.3.0) multi_json (~> 1.0) - factory_girl (4.1.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.1.0) - factory_girl (~> 4.1.0) + factory_girl (2.6.4) + activesupport (>= 2.3.9) + factory_girl_rails (1.7.0) + factory_girl (~> 2.6.0) railties (>= 3.0.0) - faye (0.8.6) + faye (0.8.0) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) eventmachine (>= 0.12.0) faye-websocket (>= 0.4.0) rack (>= 1.0.0) yajl-ruby (>= 1.0.0) - faye-websocket (0.4.6) + faye-websocket (0.4.1) eventmachine (>= 0.12.0) - fssm (0.2.9) + fssm (0.2.8.1) haml (3.1.7) hike (1.2.1) - hirb (0.7.0) + hirb (0.6.1) http_accept_language (1.0.2) http_parser.rb (0.5.3) i18n (0.6.1) - journey (1.0.4) - jquery-rails (2.1.4) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - json (1.7.5) + journey (1.0.3) + jquery-rails (2.0.1) + railties (>= 3.2.0, < 5.0) + thor (~> 0.14) + json (1.6.5) + libv8 (3.3.10.4) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.4) + mail (2.4.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.19) + mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) multi_json (1.5.0) mysql2 (0.3.11) - nokogiri (1.5.6) + nokogiri (1.5.5) polyglot (0.3.3) - private_pub (1.0.3) + private_pub (1.0.1) faye rack (1.4.1) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.2) + rack-test (0.6.1) rack (>= 1.0) rails (3.2.2) actionmailer (= 3.2.2) @@ -137,39 +137,38 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) - rake (10.0.3) + rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - ref (1.0.2) ruby-graphviz (0.9.21) - sass (3.2.4) - sass-rails (3.2.5) + sass (3.1.15) + sass-rails (3.2.4) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.1.3) + sprockets (2.1.2) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.6) + sqlite3 (1.3.5) state_machine (1.1.2) - subexec (0.2.2) - systemu (2.5.2) - therubyracer (0.11.0) - ref + subexec (0.2.1) + systemu (2.5.1) + therubyracer (0.9.10) + libv8 (~> 3.3.10) thor (0.14.6) tilt (1.3.3) - treetop (1.4.12) + treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.35) - uglifier (1.3.0) + tzinfo (0.3.32) + uglifier (1.2.3) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) - uuid (2.3.6) + multi_json (>= 1.0.2) + uuid (2.3.5) macaddr (~> 1.0) will_paginate (3.0.3) yajl-ruby (1.1.0) -- cgit v1.2.3 From 319b4adeb16b65618983a6268b21ea21efafed78 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 7 Jan 2013 12:45:36 +0100 Subject: Upgraded uglifier and removed therubyracer and erd. --- Gemfile.lock | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 64efe4b..df12c39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,7 +67,7 @@ GEM eventmachine erubis (2.7.0) eventmachine (1.0.0.beta.4) - execjs (1.3.0) + execjs (1.4.0) multi_json (~> 1.0) factory_girl (2.6.4) activesupport (>= 2.3.9) @@ -95,7 +95,6 @@ GEM railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.6.5) - libv8 (3.3.10.4) macaddr (1.6.1) systemu (~> 2.5.0) mail (2.4.3) @@ -105,7 +104,7 @@ GEM mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) - multi_json (1.1.0) + multi_json (1.5.0) mysql2 (0.3.11) nokogiri (1.5.5) polyglot (0.3.3) @@ -126,10 +125,6 @@ GEM activesupport (= 3.2.2) bundler (~> 1.0) railties (= 3.2.2) - rails-erd (0.4.5) - activerecord (~> 3.0) - activesupport (~> 3.0) - ruby-graphviz (~> 0.9.18) railties (3.2.2) actionpack (= 3.2.2) activesupport (= 3.2.2) @@ -140,7 +135,6 @@ GEM rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - ruby-graphviz (0.9.21) sass (3.1.15) sass-rails (3.2.4) railties (~> 3.2.0) @@ -157,17 +151,15 @@ GEM state_machine (1.1.2) subexec (0.2.1) systemu (2.5.1) - 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) tzinfo (0.3.32) - uglifier (1.2.3) + uglifier (1.3.0) execjs (>= 0.3.0) - multi_json (>= 1.0.2) + multi_json (~> 1.0, >= 1.0.2) uuid (2.3.5) macaddr (~> 1.0) will_paginate (3.0.3) @@ -198,12 +190,10 @@ DEPENDENCIES nokogiri private_pub rails (= 3.2.2) - rails-erd (~> 0.4.5) sass-rails (~> 3.2.3) simple_form (= 2.0.1) sqlite3 state_machine - therubyracer - uglifier (>= 1.0.3) + uglifier (>= 1.3.0) uuid will_paginate -- cgit v1.2.3 From 70c436c52c76cf866b03fcab6bc43437c9490cd1 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 10 Jan 2013 10:34:57 +0100 Subject: GsParameter :entity, :section and :name can't be changed in the GUI any more. --- Gemfile.lock | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index df12c39..8c13c02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,6 +149,10 @@ GEM tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.5) state_machine (1.1.2) + strong_parameters (0.1.6) + actionpack (~> 3.0) + activemodel (~> 3.0) + railties (~> 3.0) subexec (0.2.1) systemu (2.5.1) thor (0.14.6) @@ -194,6 +198,7 @@ DEPENDENCIES simple_form (= 2.0.1) sqlite3 state_machine + strong_parameters uglifier (>= 1.3.0) uuid will_paginate -- cgit v1.2.3 From 7b1295884861b222e441f431089ea3a6d99fd569 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 10 Jan 2013 11:45:46 +0100 Subject: Started to fragment cache gs_parameter views. --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 8c13c02..bafe83f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,6 +34,8 @@ GEM bcrypt-ruby (3.0.1) breadcrumbs_on_rails (2.2.0) builder (3.0.0) + cache_digests (0.2.0) + actionpack (>= 3.2) cancan (1.6.7) carrierwave (0.5.8) activesupport (~> 3.0) @@ -176,6 +178,7 @@ DEPENDENCIES acts_as_list bcrypt-ruby breadcrumbs_on_rails + cache_digests cancan carrierwave coffee-rails (~> 3.2.1) -- cgit v1.2.3 From 6dbf83677d0dbaea92ad2f3a9f76f1e6c38300d7 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Fri, 11 Jan 2013 01:23:53 +0100 Subject: add memcache-client, should resolve issue #88 --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index bafe83f..039336c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,6 +103,7 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) + memcache-client (1.8.5) mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) -- cgit v1.2.3 From b65c9f21c97371b6fbdeeae2e44f4111313b4337 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 11 Jan 2013 10:30:24 +0100 Subject: Activated dalli as the memcached client. --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 039336c..fc4ba3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,6 +54,7 @@ GEM compass-rails (1.0.0.rc.3) compass (~> 0.12.rc.0) cookiejar (0.3.0) + dalli (2.6.0) delayed_job (3.0.1) activesupport (~> 3.0) delayed_job_active_record (0.3.2) @@ -103,7 +104,6 @@ GEM i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - memcache-client (1.8.5) mime-types (1.17.2) mini_magick (3.4) subexec (~> 0.2.1) @@ -184,6 +184,7 @@ DEPENDENCIES carrierwave coffee-rails (~> 3.2.1) compass-rails + dalli delayed_job delayed_job_active_record factory_girl -- cgit v1.2.3 From af49b3390ce352297c3b601c69b6b0557a9ae01d Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 11 Jan 2013 19:30:56 +0100 Subject: Load the production database configuration from the system odbc.ini file. --- Gemfile.lock | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index fc4ba3a..77d09fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,6 +93,7 @@ GEM http_accept_language (1.0.2) http_parser.rb (0.5.3) i18n (0.6.1) + inifile (2.0.2) journey (1.0.3) jquery-rails (2.0.1) railties (>= 3.2.0, < 5.0) @@ -192,6 +193,7 @@ DEPENDENCIES haml hirb http_accept_language + inifile jquery-rails json mini_magick -- cgit v1.2.3 From 9c23099b8f93e0ace47caba051204eb6624b8c95 Mon Sep 17 00:00:00 2001 From: "Mario \"Kuroir\" Ricalde" Date: Wed, 16 Jan 2013 02:45:18 -0600 Subject: Updates Rails to 3.2.9 --- Gemfile.lock | 166 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 84 insertions(+), 82 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 77d09fe..dd98f2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,176 +1,178 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.2) - actionpack (= 3.2.2) - mail (~> 2.4.0) - actionpack (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + actionmailer (3.2.9) + actionpack (= 3.2.9) + mail (~> 2.4.4) + actionpack (3.2.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.1) + journey (~> 1.0.4) rack (~> 1.4.0) - rack-cache (~> 1.1) + rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.2) - activesupport (= 3.2.2) + sprockets (~> 2.2.1) + activemodel (3.2.9) + activesupport (= 3.2.9) builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + activerecord (3.2.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - activesupport (3.2.2) + activeresource (3.2.9) + activemodel (= 3.2.9) + activesupport (= 3.2.9) + activesupport (3.2.9) i18n (~> 0.6) multi_json (~> 1.0) - acts_as_list (0.1.5) - addressable (2.2.7) + acts_as_list (0.1.9) + addressable (2.3.2) arel (3.0.2) bcrypt-ruby (3.0.1) - breadcrumbs_on_rails (2.2.0) - builder (3.0.0) + breadcrumbs_on_rails (2.3.0) + builder (3.0.4) cache_digests (0.2.0) actionpack (>= 3.2) - cancan (1.6.7) - carrierwave (0.5.8) - activesupport (~> 3.0) - chunky_png (1.2.5) + cancan (1.6.8) + carrierwave (0.8.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + chunky_png (1.2.7) coffee-rails (3.2.2) coffee-script (>= 2.2.0) railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.2.0) - compass (0.12.rc.1) + coffee-script-source (1.4.0) + compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.0.0.rc.3) - compass (~> 0.12.rc.0) + compass-rails (1.0.3) + compass (>= 0.12.2, < 0.14) cookiejar (0.3.0) dalli (2.6.0) - delayed_job (3.0.1) + delayed_job (3.0.4) activesupport (~> 3.0) - delayed_job_active_record (0.3.2) - activerecord (> 2.1.0) - delayed_job (~> 3.0.0) - em-http-request (1.0.1) + delayed_job_active_record (0.3.3) + activerecord (>= 2.1.0, < 4) + delayed_job (~> 3.0) + em-http-request (1.0.3) addressable (>= 2.2.3) cookiejar em-socksify eventmachine (>= 1.0.0.beta.4) http_parser.rb (>= 0.5.3) - em-socksify (0.1.0) - eventmachine + em-socksify (0.2.1) + eventmachine (>= 1.0.0.beta.4) erubis (2.7.0) - eventmachine (1.0.0.beta.4) + eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (2.6.4) - activesupport (>= 2.3.9) - factory_girl_rails (1.7.0) - factory_girl (~> 2.6.0) + factory_girl (4.1.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.1.0) + factory_girl (~> 4.1.0) railties (>= 3.0.0) - faye (0.8.0) + faye (0.8.8) cookiejar (>= 0.3.0) em-http-request (>= 0.3.0) eventmachine (>= 0.12.0) faye-websocket (>= 0.4.0) rack (>= 1.0.0) yajl-ruby (>= 1.0.0) - faye-websocket (0.4.1) + faye-websocket (0.4.6) eventmachine (>= 0.12.0) - fssm (0.2.8.1) + fssm (0.2.9) haml (3.1.7) hike (1.2.1) - hirb (0.6.1) + hirb (0.7.0) http_accept_language (1.0.2) http_parser.rb (0.5.3) i18n (0.6.1) inifile (2.0.2) - journey (1.0.3) - jquery-rails (2.0.1) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.6.5) + journey (1.0.4) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.7.6) macaddr (1.6.1) systemu (~> 2.5.0) - mail (2.4.3) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.17.2) + mime-types (1.19) mini_magick (3.4) subexec (~> 0.2.1) multi_json (1.5.0) mysql2 (0.3.11) - nokogiri (1.5.5) + nokogiri (1.5.6) polyglot (0.3.3) - private_pub (1.0.1) + private_pub (1.0.3) faye - rack (1.4.1) + rack (1.4.4) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rails (3.2.2) - actionmailer (= 3.2.2) - actionpack (= 3.2.2) - activerecord (= 3.2.2) - activeresource (= 3.2.2) - activesupport (= 3.2.2) + rails (3.2.9) + actionmailer (= 3.2.9) + actionpack (= 3.2.9) + activerecord (= 3.2.9) + activeresource (= 3.2.9) + activesupport (= 3.2.9) bundler (~> 1.0) - railties (= 3.2.2) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) + railties (= 3.2.9) + railties (3.2.9) + actionpack (= 3.2.9) + activesupport (= 3.2.9) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) - rake (0.9.2.2) + thor (>= 0.14.6, < 2.0) + rake (10.0.3) rdoc (3.12) json (~> 1.4) - sass (3.1.15) - sass-rails (3.2.4) + sass (3.2.5) + sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) - sprockets (2.1.2) + sprockets (2.2.2) hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sqlite3 (1.3.5) + sqlite3 (1.3.7) state_machine (1.1.2) strong_parameters (0.1.6) actionpack (~> 3.0) activemodel (~> 3.0) railties (~> 3.0) - subexec (0.2.1) - systemu (2.5.1) - thor (0.14.6) + subexec (0.2.2) + systemu (2.5.2) + thor (0.16.0) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.32) + tzinfo (0.3.35) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) - uuid (2.3.5) + uuid (2.3.6) macaddr (~> 1.0) - will_paginate (3.0.3) + will_paginate (3.0.4) yajl-ruby (1.1.0) PLATFORMS @@ -200,8 +202,8 @@ DEPENDENCIES mysql2 nokogiri private_pub - rails (= 3.2.2) - sass-rails (~> 3.2.3) + rails (= 3.2.9) + sass-rails simple_form (= 2.0.1) sqlite3 state_machine -- cgit v1.2.3 From 1cf48357d936056e383a52a3410f87b89e1a9829 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 10:59:10 +0100 Subject: Upgraded Rails to 3.2.11 --- Gemfile.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index dd98f2d..d82d82f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: http://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) @@ -14,18 +14,18 @@ GEM 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_list (0.1.9) @@ -122,17 +122,17 @@ GEM 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.9) - actionpack (= 3.2.9) - activesupport (= 3.2.9) + railties (= 3.2.11) + railties (3.2.11) + actionpack (= 3.2.11) + activesupport (= 3.2.11) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -202,7 +202,7 @@ DEPENDENCIES mysql2 nokogiri private_pub - rails (= 3.2.9) + rails (= 3.2.11) sass-rails simple_form (= 2.0.1) sqlite3 -- cgit v1.2.3 From 962e07e58451f5d21cab9804191139be0f20189b Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 11:39:35 +0100 Subject: Downgraded CanCan to version 1.6.7 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index d82d82f..e4deaeb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,7 @@ GEM builder (3.0.4) cache_digests (0.2.0) actionpack (>= 3.2) - cancan (1.6.8) + cancan (1.6.7) carrierwave (0.8.0) activemodel (>= 3.2.0) activesupport (>= 3.2.0) @@ -183,7 +183,7 @@ DEPENDENCIES bcrypt-ruby breadcrumbs_on_rails cache_digests - cancan + cancan (= 1.6.7) carrierwave coffee-rails (~> 3.2.1) compass-rails -- cgit v1.2.3 From 16c2367e7e291fdc063f77cbdcbc41874060554a Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 22:36:21 +0100 Subject: bundle update --- Gemfile.lock | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index e4deaeb..0beeb3b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,6 +100,7 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.7.6) + kgio (2.7.4) macaddr (1.6.1) systemu (~> 2.5.0) mail (2.4.4) @@ -137,6 +138,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) + raindrops (0.10.0) rake (10.0.3) rdoc (3.12) json (~> 1.4) @@ -170,6 +172,10 @@ GEM uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) + unicorn (4.5.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) uuid (2.3.6) macaddr (~> 1.0) will_paginate (3.0.4) @@ -209,5 +215,6 @@ DEPENDENCIES state_machine strong_parameters uglifier (>= 1.3.0) + unicorn uuid will_paginate -- cgit v1.2.3 From 3a0213af9ae9fab41dd854e94aa668ee2abc6414 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 13:27:41 +0100 Subject: Added sextant to render all routes => http://0.0.0.0:3000/rails/routes --- Gemfile.lock | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 0beeb3b..3ee9d06 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,6 +147,9 @@ GEM railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + sextant (0.2.3) + activesupport (>= 3.2) + rails (>= 3.2) simple_form (2.0.1) actionpack (~> 3.0) activemodel (~> 3.0) @@ -210,6 +213,7 @@ DEPENDENCIES private_pub rails (= 3.2.11) sass-rails + sextant simple_form (= 2.0.1) sqlite3 state_machine -- cgit v1.2.3 From f0f27ea9b4a1ae9f0d47c2e900da7882fe0bceaa Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 19:11:55 +0100 Subject: added gem 'quiet_assets' --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 3ee9d06..b21a99e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,6 +116,8 @@ GEM polyglot (0.3.3) private_pub (1.0.3) faye + quiet_assets (1.0.1) + railties (~> 3.1) rack (1.4.4) rack-cache (1.2) rack (>= 0.4) @@ -211,6 +213,7 @@ DEPENDENCIES mysql2 nokogiri private_pub + quiet_assets rails (= 3.2.11) sass-rails sextant -- cgit v1.2.3 From 66147369d3f1a96ebd7c20bb89165a116ec1e147 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 19:20:30 +0100 Subject: Use thin to get rid of those annoying "WARN Could not determine content-length of response body." log entries. --- Gemfile.lock | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index b21a99e..79c6339 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,6 +55,7 @@ GEM compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) cookiejar (0.3.0) + daemons (1.1.9) dalli (2.6.0) delayed_job (3.0.4) activesupport (~> 3.0) @@ -168,6 +169,10 @@ GEM railties (~> 3.0) subexec (0.2.2) systemu (2.5.2) + thin (1.5.0) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) thor (0.16.0) tilt (1.3.3) treetop (1.4.12) @@ -221,6 +226,7 @@ DEPENDENCIES sqlite3 state_machine strong_parameters + thin uglifier (>= 1.3.0) unicorn uuid -- cgit v1.2.3