Created
October 24, 2013 06:16
-
-
Save mender/7132159 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Gemfile.lock b/Gemfile.lock | |
| index 4e67f43..d1be4ef 100644 | |
| --- a/Gemfile.lock | |
| +++ b/Gemfile.lock | |
| @@ -91,10 +91,6 @@ GEM | |
| remote: http://apress:montalcino@gems.dev.apress.ru/ | |
| specs: | |
| aasm (3.0.20) | |
| - abak-yml_parsers (0.0.2) | |
| - activesupport (>= 3.0.0) | |
| - i18n | |
| - yandex_market-parser | |
| actionmailer (3.1.12) | |
| actionpack (= 3.1.12) | |
| mail (~> 2.4.4) | |
| @@ -143,6 +139,11 @@ GEM | |
| awesome_nested_set (2.0.2) | |
| activerecord (>= 3.0.0) | |
| awesome_print (1.1.0) | |
| + backbone-on-rails (1.0.0.1) | |
| + eco | |
| + ejs | |
| + jquery-rails | |
| + rails (>= 3.1) | |
| better_errors (1.0.1) | |
| coderay (>= 1.0.0) | |
| erubis (>= 2.6.6) | |
| @@ -161,14 +162,24 @@ GEM | |
| cells (3.8.8) | |
| actionpack (>= 3.0) | |
| railties (>= 3.0) | |
| + celluloid (0.15.1) | |
| + timers (~> 1.1.0) | |
| childprocess (0.3.9) | |
| ffi (~> 1.0, >= 1.0.11) | |
| ckeditor_rails (3.6.4.1) | |
| railties (~> 3.0) | |
| thor (~> 0.14) | |
| + class_logger (1.0.1) | |
| + activesupport (>= 3.0) | |
| cocaine (0.3.2) | |
| coderay (1.0.9) | |
| + coffee-script (2.2.0) | |
| + coffee-script-source | |
| + execjs | |
| + coffee-script-source (1.6.3) | |
| columnize (0.3.6) | |
| + commander (4.1.5) | |
| + highline (~> 1.6.11) | |
| coolline (0.4.2) | |
| dalli (2.2.1) | |
| database_cleaner (1.1.1) | |
| @@ -184,9 +195,16 @@ GEM | |
| diffy (3.0.1) | |
| draper (0.11.1) | |
| activesupport (>= 2.3.10) | |
| + eco (1.0.0) | |
| + coffee-script | |
| + eco-source | |
| + execjs | |
| + eco-source (1.1.0.rc.1) | |
| + ejs (1.1.1) | |
| erubis (2.7.0) | |
| execjs (2.0.0) | |
| fabrication (2.7.2) | |
| + facets (2.9.3) | |
| factory_girl (3.1.1) | |
| activesupport (>= 3.0.0) | |
| factory_girl_rails (3.1.0) | |
| @@ -236,9 +254,9 @@ GEM | |
| haml (4.0.3) | |
| tilt | |
| hashie (2.0.5) | |
| + highline (1.6.19) | |
| hike (1.2.3) | |
| hirb (0.7.1) | |
| - hooks (0.2.2) | |
| httpauth (0.2.0) | |
| httpclient (2.3.4.1) | |
| i18n (0.6.5) | |
| @@ -246,6 +264,7 @@ GEM | |
| formtastic (~> 2.2) | |
| railties (~> 3.0) | |
| innertube (1.1.0) | |
| + io_splice (4.2.0) | |
| jazz_hands (0.5.1) | |
| awesome_print (~> 1.1.0) | |
| coderay (~> 1.0.9) | |
| @@ -266,6 +285,46 @@ GEM | |
| jwt (0.1.8) | |
| multi_json (>= 1.5) | |
| kgio (2.8.0) | |
| + kirby-cli (0.7.6) | |
| + oj | |
| + kirby-csv (0.7.6) | |
| + facets | |
| + io_splice | |
| + kirby-cli (= 0.7.6) | |
| + oj | |
| + posix-spawn | |
| + rcsv | |
| + kirby-diff (0.7.6) | |
| + commander | |
| + oj (>= 2.0.6) | |
| + redis (~> 3.0.0) | |
| + redis-namespace | |
| + kirby-lynx (0.7.6) | |
| + addressable | |
| + commander | |
| + localmemcache (~> 0.4.4) | |
| + localmemcache_store | |
| + oj (>= 2.0.6) | |
| + kirby-models (0.7.6) | |
| + oj (>= 2.0.6) | |
| + kirby-preprocessor (0.7.6) | |
| + facets | |
| + kirby-cli (= 0.7.6) | |
| + oj (>= 2.0.6) | |
| + kirby-tool_chain (0.7.6) | |
| + io_splice | |
| + kirby-csv (= 0.7.6) | |
| + kirby-diff (= 0.7.6) | |
| + kirby-lynx (= 0.7.6) | |
| + kirby-models (= 0.7.6) | |
| + kirby-preprocessor (= 0.7.6) | |
| + kirby-yml (= 0.7.6) | |
| + posix-spawn | |
| + kirby-yml (0.7.6) | |
| + kirby-cli (= 0.7.6) | |
| + oj | |
| + ox | |
| + ox-mapper (~> 0.2.0) | |
| koala (1.6.0) | |
| addressable (~> 2.2) | |
| faraday (~> 0.8) | |
| @@ -277,6 +336,9 @@ GEM | |
| rb-fsevent (>= 0.9.3) | |
| rb-inotify (>= 0.9) | |
| rb-kqueue (>= 0.2) | |
| + localmemcache (0.4.4) | |
| + localmemcache_store (0.0.8) | |
| + localmemcache (>= 0.4.4) | |
| lumberjack (1.0.4) | |
| mail (2.4.4) | |
| i18n (>= 0.4.0) | |
| @@ -301,6 +363,9 @@ GEM | |
| rack (~> 1.2) | |
| oj (2.1.4) | |
| orm_adapter (0.0.7) | |
| + ox (2.0.9) | |
| + ox-mapper (0.2.0) | |
| + ox | |
| pg (0.16.0) | |
| polyglot (0.3.3) | |
| posix-spawn (0.3.6) | |
| @@ -364,6 +429,7 @@ GEM | |
| rb-kqueue (0.2.0) | |
| ffi (>= 0.5.0) | |
| rchardet19 (1.3.5) | |
| + rcsv (0.1.1) | |
| rdoc (3.12.2) | |
| json (~> 1.4) | |
| redis (3.0.4) | |
| @@ -451,8 +517,6 @@ GEM | |
| railties (~> 3.1.0) | |
| sass (>= 3.1.10) | |
| tilt (~> 1.3.2) | |
| - sax_stream (1.0.3) | |
| - nokogiri (>= 1.5.2) | |
| segment_tree (0.1.0) | |
| selenium-webdriver (2.35.0) | |
| childprocess (>= 0.2.5) | |
| @@ -460,7 +524,7 @@ GEM | |
| rubyzip | |
| websocket (~> 1.0.4) | |
| sexp_processor (4.3.0) | |
| - shoulda-matchers (1.1.0) | |
| + shoulda-matchers (2.4.0) | |
| activesupport (>= 3.0.0) | |
| silent-postgres (0.1.1) | |
| simplecov (0.7.1) | |
| @@ -505,6 +569,7 @@ GEM | |
| tilt (1.3.7) | |
| timecop (0.6.3) | |
| timeliness (0.3.7) | |
| + timers (1.1.0) | |
| treetop (1.4.15) | |
| polyglot | |
| polyglot (>= 0.3.1) | |
| @@ -537,9 +602,6 @@ GEM | |
| xml-simple (1.1.2) | |
| xpath (0.1.4) | |
| nokogiri (~> 1.3) | |
| - yandex_market-parser (0.0.4) | |
| - hooks (~> 0.2.1) | |
| - sax_stream (~> 1.0.3) | |
| yard (0.8.7.2) | |
| PLATFORMS | |
| @@ -547,7 +609,6 @@ PLATFORMS | |
| DEPENDENCIES | |
| aasm (~> 3.0.20) | |
| - abak-yml_parsers (= 0.0.2) | |
| abak_crossposting (~> 0.0.7)! | |
| active_attr (~> 0.8.2) | |
| active_scaffold! | |
| @@ -561,13 +622,16 @@ DEPENDENCIES | |
| authlogic (~> 3.2.0) | |
| awesome_nested_set (~> 2.0.2) | |
| aws-s3 (~> 0.6.2)! | |
| + backbone-on-rails | |
| better_errors | |
| big_sitemap! | |
| capybara (~> 1.1.4) | |
| carrierwave | |
| cells (~> 3.8.8) | |
| + celluloid (~> 0.15) | |
| ckeditor! | |
| ckeditor_rails (~> 3.6.4) | |
| + class_logger (~> 1.0.1) | |
| cocaine (= 0.3.2) | |
| dalli (~> 2.2.0) | |
| database_cleaner (>= 1.0.1) | |
| @@ -590,6 +654,7 @@ DEPENDENCIES | |
| jazz_hands | |
| jquery-rails (~> 1.0.17) | |
| json_spec! | |
| + kirby-tool_chain (~> 0.7.6) | |
| letter_opener! | |
| mimetype-fu (~> 0.1.2) | |
| mock_redis (~> 0.8.1) | |
| @@ -611,7 +676,7 @@ DEPENDENCIES | |
| redis-mutex (~> 2.1.1) | |
| redis-namespace (~> 1.3.0) | |
| request_store | |
| - resque-integration (~> 0.2.8) | |
| + resque-integration (~> 0.2.10) | |
| resque-scheduler (= 2.0.0) | |
| rmagick (= 2.13.2) | |
| rspec-cells (~> 0.1.7) | |
| @@ -624,7 +689,7 @@ DEPENDENCIES | |
| sanitize (~> 2.0.6) | |
| sass-rails (~> 3.1.5) | |
| segment_tree (>= 0.1.0) | |
| - shoulda-matchers (~> 1.1.0) | |
| + shoulda-matchers (~> 2.4.0) | |
| silent-postgres (~> 0.1.1) | |
| simplecov | |
| simpleidn |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment