From 1f526adc23e90582fff75c23050dbbff61cf6970 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Fri, 26 Jun 2015 14:46:32 +0300 Subject: [PATCH] Gems updates: bootstrap-sass, better_errors, brakeman #2711 --- Gemfile | 9 +++++---- Gemfile.lock | 47 ++++++++++++++++++----------------------------- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/Gemfile b/Gemfile index 27567e066..e76e045d7 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ gem 'nokogiri', '~> 1.6.6.2' # For XML parsing # style gem 'sass-rails', '~> 5.0.3' # sass style -gem 'bootstrap-sass', '~> 3.3.4.1' # bootstrap style +gem 'bootstrap-sass', '~> 3.3.5.1' # bootstrap style # js gem 'uglifier', '~> 2.7.1' # minifies js @@ -107,7 +107,7 @@ group :development do gem 'guard-rubocop', '~> 1.1.0' # improved errors - gem 'better_errors', '~> 2.0.0' + gem 'better_errors', '~> 2.1.1' # webconsole replacement gem 'binding_of_caller', '~> 0.7.2' gem 'traceroute', '~> 0.4.0' # for finding dead routes and unused actions @@ -140,9 +140,10 @@ group :development, :test do gem 'bundler-audit', github: 'rubysec/bundler-audit', ref: 'f89ef7fae1090bbad825ea76812d56d72b417055' # for finding future vulnerable gems - gem 'brakeman', '~> 2.6.2', require: false # for security audit' + gem 'brakeman', '~> 3.0.5', require: false # for security audit' # tmp, otherwise conflics with breakman - gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d' + # gem 'html2haml', github: 'haml/html2haml', ref: '6984f50bdbbd6291535027726a5697f28778ee8d' + gem 'html2haml', '~> 2.0.0' gem 'sdoc', '~> 0.4.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'railroady', '~> 1.3.0' # to generate database diagrams diff --git a/Gemfile.lock b/Gemfile.lock index 8ddfc63b5..20aa1aee3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,17 +16,6 @@ GIT data_migrate (1.3.0) rails (>= 4.1.0) -GIT - remote: https://github.com/haml/html2haml.git - revision: 6984f50bdbbd6291535027726a5697f28778ee8d - ref: 6984f50bdbbd6291535027726a5697f28778ee8d - specs: - html2haml (2.0.0.beta.2) - erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) - ruby_parser (~> 3.5) - GIT remote: https://github.com/internetee/epp.git revision: 505c3f2739eb1da918e54111aecfb138a822739d @@ -96,7 +85,7 @@ GEM actionpack activesupport (>= 3.0.0) rspec - autoprefixer-rails (5.2.0.1) + autoprefixer-rails (5.2.1) execjs json axiom-types (0.1.1) @@ -104,7 +93,7 @@ GEM ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) bcrypt (3.1.10) - better_errors (2.0.0) + better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) @@ -112,19 +101,18 @@ GEM debug_inspector (>= 0.0.1) bootstrap-datepicker-rails (1.3.1.1) railties (>= 3.0) - bootstrap-sass (3.3.4.1) + bootstrap-sass (3.3.5.1) autoprefixer-rails (>= 5.0.0.1) - sass (>= 3.2.19) - brakeman (2.6.3) + sass (>= 3.3.0) + brakeman (3.0.5) erubis (~> 2.6) fastercsv (~> 1.5) haml (>= 3.0, < 5.0) highline (~> 1.6.20) multi_json (~> 1.2) ruby2ruby (~> 2.1.1) - ruby_parser (~> 3.5.0) + ruby_parser (~> 3.7.0) sass (~> 3.0) - slim (>= 1.3.6, < 3.0) terminal-table (~> 1.4) builder (3.2.2) bullet (4.14.7) @@ -239,6 +227,11 @@ GEM highline (1.6.21) hitimes (1.2.2) hpricot (0.8.6) + html2haml (2.0.0) + erubis (~> 2.7.0) + haml (~> 4.0.0) + nokogiri (~> 1.6.0) + ruby_parser (~> 3.5) html5_validators (1.2.0) httpclient (2.6.0.1) httpi (2.4.1) @@ -363,7 +356,7 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) - raindrops (0.13.0) + raindrops (0.14.0) rake (10.4.2) ransack (1.5.1) actionpack (>= 3.0) @@ -414,7 +407,7 @@ GEM ruby2ruby (2.1.4) ruby_parser (~> 3.1) sexp_processor (~> 4.0) - ruby_parser (3.5.0) + ruby_parser (3.7.0) sexp_processor (~> 4.1) rubycritic (1.1.1) flay (= 2.4.0) @@ -424,7 +417,7 @@ GEM ruby2ruby (>= 2.1.1, < 3.0) virtus (~> 1.0) safe_yaml (1.0.4) - sass (3.4.14) + sass (3.4.15) sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -458,9 +451,6 @@ GEM rack (~> 1.4) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - slim (2.1.0) - temple (~> 0.6.9) - tilt (>= 1.3.3, < 2.1) slop (3.6.0) spring (1.3.6) spring-commands-rspec (1.0.4) @@ -473,7 +463,6 @@ GEM sprockets (>= 2.8, < 4.0) sys-uname (0.9.0) ffi (>= 1.0.0) - temple (0.6.10) terminal-table (1.4.5) therubyracer (0.12.2) libv8 (~> 3.16.14.0) @@ -522,11 +511,11 @@ PLATFORMS DEPENDENCIES activerecord-import (~> 0.7.0) autodoc - better_errors (~> 2.0.0) + better_errors (~> 2.1.1) binding_of_caller (~> 0.7.2) bootstrap-datepicker-rails (~> 1.3.1.1) - bootstrap-sass (~> 3.3.4.1) - brakeman (~> 2.6.2) + bootstrap-sass (~> 3.3.5.1) + brakeman (~> 3.0.5) bullet (~> 4.14.4) bundler-audit! cancancan (~> 1.9.2) @@ -551,7 +540,7 @@ DEPENDENCIES guard-rubocop (~> 1.1.0) haml-rails (~> 0.9.0) hashie-forbidden_attributes (~> 0.1.1) - html2haml! + html2haml (~> 2.0.0) html5_validators (~> 1.2.0) isikukood iso8601 (~> 0.8.2)