From 29f27306b6bb697eb722915ecddfbfae279acaa4 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Fri, 7 Oct 2016 02:42:58 +0300 Subject: [PATCH] Update the bundle --- Gemfile | 2 +- Gemfile.lock | 108 +++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 57 deletions(-) diff --git a/Gemfile b/Gemfile index 393994d..399859f 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem 'phony_rails' # Picture uploads gem 'carrierwave' -gem 'rmagick', github: "gemhome/rmagick" +gem 'rmagick' gem "refile", require: ['refile/rails', 'refile/simple_form'] gem "refile-mini_magick" diff --git a/Gemfile.lock b/Gemfile.lock index e20c2e2..0e9f86c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,3 @@ -GIT - remote: git://github.com/gemhome/rmagick.git - revision: d343a9d6b79edfdcc16817143d893c1ba42f4928 - specs: - rmagick (2.15.4) - GEM remote: https://rubygems.org/ specs: @@ -43,15 +37,15 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) - airbrussh (1.0.2) + airbrussh (1.1.1) sshkit (>= 1.6.1, != 1.7.0) arel (6.0.3) ast (2.3.0) - autoprefixer-rails (6.3.7) + autoprefixer-rails (6.5.0.2) execjs awesome_print (1.7.0) bcrypt (3.1.11) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) bootstrap-sass-extras (0.0.7) @@ -59,23 +53,23 @@ GEM bootswatch-rails (3.3.5) railties (>= 3.1) builder (3.2.2) - capistrano (3.5.0) + capistrano (3.6.1) airbrussh (>= 1.0.0) capistrano-harrow i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.1.4) + capistrano-bundler (1.2.0) capistrano (~> 3.1) sshkit (~> 1.2) - capistrano-harrow (0.5.2) - capistrano-rails (1.1.7) + capistrano-harrow (0.5.3) + capistrano-rails (1.1.8) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano3-puma (1.2.1) capistrano (~> 3.0) puma (>= 2.6) - capybara (2.7.1) + capybara (2.10.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -98,8 +92,8 @@ GEM execjs coffee-script-source (1.10.0) concurrent-ruby (1.0.2) - copy_carrierwave_file (1.1.0) - carrierwave (~> 0.9) + copy_carrierwave_file (1.3.0) + carrierwave (>= 0.9) devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -109,7 +103,7 @@ GEM devise-i18n (1.1.0) diff-lcs (1.2.5) docile (1.1.5) - domain_name (0.5.20160615) + domain_name (0.5.20160826) unf (>= 0.0.5, < 1.0.0) easy_translate (0.5.0) json @@ -122,13 +116,13 @@ GEM factory_girl_rails (4.7.0) factory_girl (~> 4.7.0) railties (>= 3.0.0) - faker (1.6.3) + faker (1.6.6) i18n (~> 0.5) - ffi (1.9.10) + ffi (1.9.14) font-awesome-sass (4.6.2) sass (>= 3.2) formatador (0.2.5) - globalid (0.3.6) + globalid (0.3.7) activesupport (>= 4.1.0) globalize (5.0.1) activemodel (>= 4.2.0, < 4.3) @@ -143,13 +137,13 @@ GEM shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-rspec (4.7.2) + guard-rspec (4.7.3) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) highline (1.7.8) hirb (0.7.3) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) i18n (0.7.0) i18n-tasks (0.9.5) @@ -162,7 +156,7 @@ GEM parser (>= 2.2.3.0) term-ansicolor (>= 1.3.2) terminal-table (>= 1.5.1) - jbuilder (2.5.0) + jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) jquery-datatables-rails (3.4.0) @@ -170,7 +164,7 @@ GEM jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.1.1) + jquery-rails (4.2.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) @@ -186,11 +180,11 @@ GEM mail (2.6.4) mime-types (>= 1.16, < 4) method_source (0.8.2) - mime-types (2.99.2) - mimemagic (0.3.1) + mime-types (2.99.3) + mimemagic (0.3.2) mini_magick (4.5.1) mini_portile2 (2.1.0) - minitest (5.9.0) + minitest (5.9.1) morrisjs-rails (0.5.1) railties (> 3.1, < 5) multi_json (1.12.1) @@ -200,28 +194,26 @@ GEM net-ssh (>= 2.6.5) net-ssh (3.2.0) netrc (0.11.0) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - notiffany (0.1.0) + notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - parser (2.3.1.2) + parser (2.3.1.4) ast (~> 2.2) - pg (0.18.4) - phony (2.15.26) + pg (0.19.0) + phony (2.15.32) phony_rails (0.14.2) activesupport (>= 3.0) phony (~> 2.12) - pkg-config (1.1.7) - pry (0.10.3) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) pry-rails (0.3.4) pry (>= 0.9.10) - puma (3.4.0) + puma (3.6.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.4) @@ -246,7 +238,7 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-erd (1.4.7) + rails-erd (1.5.0) activerecord (>= 3.2) activesupport (>= 3.2) choice (~> 0.2.0) @@ -261,7 +253,7 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) + rake (11.3.0) raphael-rails (2.1.2) rb-fsevent (0.9.7) rb-inotify (0.9.7) @@ -274,17 +266,18 @@ GEM refile-mini_magick (0.2.0) mini_magick (~> 4.0) refile (~> 0.5) - responders (2.2.0) + responders (2.3.0) railties (>= 4.2.0, < 5.1) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) + rmagick (2.16.0) rspec (3.5.0) rspec-core (~> 3.5.0) rspec-expectations (~> 3.5.0) rspec-mocks (~> 3.5.0) - rspec-core (3.5.0) + rspec-core (3.5.4) rspec-support (~> 3.5.0) rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) @@ -292,7 +285,7 @@ GEM rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.5.0) - rspec-rails (3.5.0) + rspec-rails (3.5.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) @@ -302,16 +295,16 @@ GEM rspec-support (~> 3.5.0) rspec-support (3.5.0) ruby-graphviz (1.2.2) - ruby_dep (1.3.1) + ruby_dep (1.4.0) sass (3.4.22) - sass-rails (5.0.5) + sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) shellany (0.0.1) - simple_form (3.2.1) + simple_form (3.3.1) actionpack (> 4, < 5.1) activemodel (> 4, < 5.1) simplecov (0.12.0) @@ -326,29 +319,31 @@ GEM slim (3.0.7) temple (~> 0.7.6) tilt (>= 1.3.3, < 2.1) - slim-rails (3.1.0) + slim-rails (3.1.1) actionpack (>= 3.1) railties (>= 3.1) slim (~> 3.0) slop (3.6.0) - spring (1.7.2) + spring (2.0.0) + activesupport (>= 4.2) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.6.3) + sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.1.1) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.11) - sshkit (1.11.1) + sshkit (1.11.3) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) temple (0.7.7) - term-ansicolor (1.3.2) + term-ansicolor (1.4.0) tins (~> 1.0) - terminal-table (1.6.0) + terminal-table (1.7.3) + unicode-display_width (~> 1.1.1) therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref @@ -356,20 +351,21 @@ GEM thread (0.2.2) thread_safe (0.3.5) tilt (2.0.5) - tins (1.10.2) + tins (1.12.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (3.0.2) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) + unicode-display_width (1.1.1) warden (1.2.6) rack (>= 1.0) xpath (2.0.0) nokogiri (~> 1.3) - yaml_db (0.3.0) - rails (>= 3.0, < 4.3) + yaml_db (0.4.2) + rails (>= 3.0, < 5.1) rake (>= 0.8.7) PLATFORMS @@ -413,7 +409,7 @@ DEPENDENCIES raphael-rails refile refile-mini_magick - rmagick! + rmagick rspec-rails sass-rails simple_form