From 3da74a7fec226408865dc03e1dfe4340cf491126 Mon Sep 17 00:00:00 2001 From: renansoares Date: Wed, 30 Mar 2016 10:58:41 -0300 Subject: [PATCH] update rails version --- .ruby-version | 2 +- Gemfile | 9 --------- Gemfile.lock | 52 +++++++++++++++++++++++++--------------------------- Rakefile | 2 -- 4 files changed, 26 insertions(+), 39 deletions(-) diff --git a/.ruby-version b/.ruby-version index 77fee73..3e3c2f1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -1.9.3 +2.1.1 diff --git a/Gemfile b/Gemfile index a626431..b3b56db 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,6 @@ source 'https://rubygems.org' ruby '2.1.1' - -if RUBY_VERSION =~ /1.9/ - Encoding.default_external = Encoding::UTF_8 - Encoding.default_internal = Encoding::UTF_8 -end - gem 'rails', '4.1.1' gem 'activeadmin', github: 'gregbell/active_admin' @@ -91,6 +85,3 @@ group :test do gem 'launchy' gem 'selenium-webdriver' end - -gem 'libv8', '~>3.16.14.3' - diff --git a/Gemfile.lock b/Gemfile.lock index 20e621d..41e8e27 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -87,6 +87,11 @@ GEM activesupport (>= 3.2.0) json (>= 1.7) mime-types (>= 1.16) + celluloid (0.15.2) + timers (~> 1.1.0) + celluloid-io (0.15.0) + celluloid (>= 0.15.0) + nio4r (>= 0.5.0) childprocess (0.5.3) ffi (~> 1.0, >= 1.0.11) coderay (1.1.0) @@ -134,7 +139,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.9.1) + eventmachine (1.0.3) execjs (2.0.2) factory_girl (4.4.0) activesupport (>= 3.0.0) @@ -146,30 +151,25 @@ GEM faye-websocket (0.7.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.3.1) - ffi (1.9.10) + ffi (1.9.3) foreman (0.66.0) dotenv (~> 0.7.0) thor (~> 0.19.1) - formatador (0.2.5) + formatador (0.2.4) formtastic (2.3.0.rc3) actionpack (>= 3.0) - guard (2.13.0) + guard (2.6.1) formatador (>= 0.2.4) - listen (>= 2.7, <= 4.0) + listen (~> 2.7) lumberjack (~> 1.0) - nenv (~> 0.1) - notiffany (~> 0.0) pry (>= 0.9.12) - shellany (~> 0.0) thor (>= 0.18.1) guard-bundler (2.0.0) bundler (~> 1.0) guard (~> 2.2) - guard-compat (1.2.1) - guard-livereload (2.5.1) + guard-livereload (2.1.2) em-websocket (~> 0.5) - guard (~> 2.8) - guard-compat (~> 1.0) + guard (~> 2.0) multi_json (~> 1.8) guard-rails (0.5.0) guard (>= 2.0.0) @@ -230,10 +230,12 @@ GEM actionpack (>= 3.1) less (~> 2.5.0) libv8 (3.16.14.3) - listen (3.0.5) + listen (2.7.4) + celluloid (>= 0.15.2) + celluloid-io (>= 0.15.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - lumberjack (1.0.10) + lumberjack (1.0.5) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -242,19 +244,16 @@ GEM mimemagic (0.2.1) mini_portile (0.5.3) minitest (5.3.4) - multi_json (1.11.2) + multi_json (1.10.0) multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.15) - nenv (0.2.0) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.1) + nio4r (1.0.0) nokogiri (1.6.2) mini_portile (~> 0.5.2) - notiffany (0.0.8) - nenv (~> 0.1) - shellany (~> 0.0) orm_adapter (0.5.0) polyamorous (1.0.0) activerecord (>= 3.0) @@ -273,8 +272,8 @@ GEM pry quiet_assets (1.0.2) railties (>= 3.1, < 5.0) - rack (1.5.5) - rack-livereload (0.3.16) + rack (1.5.2) + rack-livereload (0.3.15) rack rack-protection (1.5.3) rack @@ -305,8 +304,8 @@ GEM polyamorous (~> 1.0.0) rb-fchange (0.0.6) ffi - rb-fsevent (0.9.7) - rb-inotify (0.9.5) + rb-fsevent (0.9.4) + rb-inotify (0.9.4) ffi (>= 0.5.0) redis (3.0.7) redis-objects (0.9.1) @@ -354,7 +353,6 @@ GEM rubyzip (~> 1.0) websocket (~> 1.0.4) sexp_processor (4.4.3) - shellany (0.0.1) simple_form (3.0.2) actionpack (~> 4.0) activemodel (~> 4.0) @@ -362,7 +360,7 @@ GEM rack (~> 1.4) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) - slop (3.6.0) + slop (3.5.0) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -379,7 +377,7 @@ GEM net-scp (>= 1.1.2) net-ssh (>= 2.8.0) therubyracer (0.12.1) - libv8 (~> 3.16.14.3) + libv8 (~> 3.16.14.0) ref thin (1.6.2) daemons (>= 1.0.9) @@ -388,6 +386,7 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) + timers (1.1.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -456,7 +455,6 @@ DEPENDENCIES kaminari-bootstrap (~> 0.1.3) launchy less-rails - libv8 (~> 3.16.14.3) mysql2 pry-debugger pry-rails diff --git a/Rakefile b/Rakefile index 5bcf850..ba6b733 100644 --- a/Rakefile +++ b/Rakefile @@ -1,8 +1,6 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. -#encoding: utf-8 - require File.expand_path('../config/application', __FILE__) Rails.application.load_tasks -- libgit2 0.21.2