diff --git a/.travis.yml b/.travis.yml index 1ca9a88..4782dc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ rvm: before_install: - gem update --system - gem --version -bundler_args: --without production services: - postgresql before_script: diff --git a/Gemfile b/Gemfile index b4dc491..c3b9325 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'jquery-rails' gem 'jbuilder', '~> 2.5' gem 'bcrypt', '~> 3.1.7' gem 'devise', '>= 4.7.1' -gem 'bootstrap-sass', '~> 3.3.6' +gem 'bootstrap-sass', '~> 3.4.1' gem 'cancancan', '~> 1.10' gem "paperclip", "~> 5.2.0" gem "figaro" diff --git a/Gemfile.lock b/Gemfile.lock index cc0d974..04a5d4c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,7 +41,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) arel (7.1.4) - autoprefixer-rails (9.3.1) + autoprefixer-rails (9.7.3) execjs aws-sdk (2.11.181) aws-sdk-resources (= 2.11.181) @@ -59,9 +59,9 @@ GEM bindex (0.5.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.7) + bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + sassc (>= 2.0.0) builder (3.2.3) byebug (10.0.2) cancancan (1.17.0) @@ -104,7 +104,7 @@ GEM railties (>= 3.0.0) faker (1.9.1) i18n (>= 0.7) - ffi (1.9.25) + ffi (1.11.3) figaro (1.1.1) thor (~> 0.14) globalid (0.4.1) @@ -187,8 +187,8 @@ GEM thor (>= 0.18.1, < 2.0) rake (12.3.1) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-inotify (0.10.0) + ffi (~> 1.0) responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) @@ -209,7 +209,7 @@ GEM rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - sass (3.7.2) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -220,6 +220,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.2.1) + ffi (~> 1.9) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -255,7 +257,7 @@ DEPENDENCIES bcrypt (~> 3.1.7) better_errors binding_of_caller - bootstrap-sass (~> 3.3.6) + bootstrap-sass (~> 3.4.1) byebug cancancan (~> 1.10) capybara (~> 2.18.0) diff --git a/config/database.yml b/config/database.yml index 4fdd480..0e33d5e 100644 --- a/config/database.yml +++ b/config/database.yml @@ -20,6 +20,7 @@ default: &default # For details on connection pooling, see rails configuration guide # http://guides.rubyonrails.org/configuring.html#database-pooling pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + host: 127.0.0.1 development: <<: *default