From 171f1780d2b1df8d877d7dce63fa1fff34704f62 Mon Sep 17 00:00:00 2001 From: Markus Graf Date: Tue, 28 Mar 2017 00:37:39 +0200 Subject: [PATCH] bump to ruby 2.3.1 --- .rubocop.yml | 2 ++ Gemfile | 2 +- Gemfile.lock | 9 +++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 4040700..7b3e7bf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,3 +15,5 @@ LineLength: Max: 160 AbcSize: Enabled: false +Style/FrozenStringLiteralComment: + Enabled: false \ No newline at end of file diff --git a/Gemfile b/Gemfile index e86d64d..eefabeb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' - +ruby '2.3.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 4.2' # Use SCSS for stylesheets diff --git a/Gemfile.lock b/Gemfile.lock index 3557425..812c1fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,8 +99,10 @@ GEM kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - kaminari-mongoid (0.1.2) - kaminari + kaminari-core (1.0.1) + kaminari-mongoid (1.0.1) + kaminari-core (~> 1.0) + mongoid loofah (2.0.3) nokogiri (>= 1.5.9) mail (2.6.4) @@ -310,5 +312,8 @@ DEPENDENCIES uglifier (>= 1.3.0) web-console (~> 2.0) +RUBY VERSION + ruby 2.3.1p112 + BUNDLED WITH 1.14.6