diff --git a/Gemfile b/Gemfile index b50ba317..bfdd3d06 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gem 'rails' gem 'has_scope' # Use SASS for stylesheets -gem 'sass-rails', '~> 5.0.0.beta1' +gem 'sass-rails' # Use Uglifier as compressor for JavaScript assets gem 'uglifier' # Use CoffeeScript for .coffee assets and views diff --git a/Gemfile.lock b/Gemfile.lock index 77d428c9..df19c725 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -236,7 +236,7 @@ GEM actionpack (>= 3.0.0) method_source (0.8.2) mime-types (2.4.3) - minitest (5.4.3) + minitest (5.5.0) modernizr-rails (2.7.1) multi_json (1.10.1) multipart-post (2.0.0) @@ -306,11 +306,12 @@ GEM ruby_parser (3.5.0) sexp_processor (~> 4.1) sass (3.4.9) - sass-rails (5.0.0.beta1) + sass-rails (5.0.0) railties (>= 4.0.0, < 5.0) - sass (~> 3.2) - sprockets (~> 2.12) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) + tilt (~> 1.1) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) @@ -421,7 +422,7 @@ DEPENDENCIES rails rails-i18n redcarpet - sass-rails (~> 5.0.0.beta1) + sass-rails sdoc (~> 0.4.0) select2-rails simple_calendar