Skip to content

Commit

Permalink
Merge pull request #427 from moneyadviceservice/update_gem_dependancies
Browse files Browse the repository at this point in the history
Update gem dependancies
  • Loading branch information
osharpe authored Mar 28, 2018
2 parents 9e33af9 + 3dedf8f commit 587ec5a
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 73 deletions.
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ gem 'active_model_serializers', '~> 0.10.1'
gem 'azure-storage'
gem 'bootstrap-sass'
gem 'bowndler', github: 'moneyadviceservice/bowndler'
gem 'devise'
gem 'devise_invitable'
gem 'devise', '3.5.10'
gem 'devise_invitable', '1.6.1'
gem 'devise_security_extension'
# Dough assets are loaded from a CDN instead of from the Gem. Do make sure that
# the CDN version is the same as the Gem version.
Expand All @@ -29,9 +29,9 @@ gem 'jquery-rails'
gem 'kaminari'
gem 'letter_opener', group: :development
gem 'mailjet'
gem 'mas-rad_core', '0.1.4'
gem 'mas-rad_core', '0.1.5'
gem 'oga'
gem 'pg'
gem 'pg', '0.21.0'
gem 'rails_email_validator'
gem 'rake', '~> 11'
gem 'ransack'
Expand Down
137 changes: 68 additions & 69 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (6.0.4)
ast (2.3.0)
autoprefixer-rails (7.1.6)
ast (2.4.0)
autoprefixer-rails (8.2.0)
execjs
azure-core (0.1.13)
azure-core (0.1.14)
faraday (~> 0.9)
faraday_middleware (~> 0.10)
nokogiri (~> 1.6)
Expand All @@ -76,27 +76,27 @@ GEM
faraday (~> 0.9)
faraday_middleware (~> 0.10)
nokogiri (~> 1.6, >= 1.6.8)
backports (3.10.3)
backports (3.11.1)
bcrypt (3.1.11)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
binding_of_caller (0.7.3)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.5)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
brakeman (4.2.0)
brakeman (4.2.1)
builder (3.2.3)
byebug (9.1.0)
capybara (2.16.1)
byebug (10.0.1)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
xpath (>= 2.0, < 4.0)
case_transform (0.2)
activesupport
celluloid (0.17.3)
Expand All @@ -123,27 +123,27 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.3)
cucumber (3.0.2)
cucumber (3.1.0)
builder (>= 2.1.2)
cucumber-core (~> 3.0.0)
cucumber-expressions (~> 4.0.3)
cucumber-core (~> 3.1.0)
cucumber-expressions (~> 5.0.4)
cucumber-wire (~> 0.0.1)
diff-lcs (~> 1.3)
gherkin (~> 4.0)
gherkin (~> 5.0)
multi_json (>= 1.7.5, < 2.0)
multi_test (>= 0.1.2)
cucumber-core (3.0.0)
cucumber-core (3.1.0)
backports (>= 3.8.0)
cucumber-tag_expressions (>= 1.0.1)
gherkin (>= 4.1.3)
cucumber-expressions (4.0.4)
cucumber-tag_expressions (~> 1.1.0)
gherkin (>= 5.0.0)
cucumber-expressions (5.0.13)
cucumber-rails (1.5.0)
capybara (>= 1.1.2, < 3)
cucumber (>= 1.3.8, < 4)
mime-types (>= 1.17, < 4)
nokogiri (~> 1.5)
railties (>= 4, < 5.2)
cucumber-tag_expressions (1.0.1)
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
Expand All @@ -163,34 +163,34 @@ GEM
diff-lcs (1.3)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubi (1.7.0)
erubi (1.7.1)
erubis (2.7.0)
execjs (2.7.0)
factory_girl (4.9.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0)
railties (>= 3.0.0)
faker (1.8.4)
i18n (~> 0.5)
faraday (0.13.1)
faker (1.8.7)
i18n (>= 0.7)
faraday (0.14.0)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
ffaker (2.7.0)
geocoder (1.4.5)
gherkin (4.1.3)
ffaker (2.8.1)
geocoder (1.4.7)
gherkin (5.0.0)
gli (2.17.1)
globalid (0.4.1)
activesupport (>= 4.2.0)
hashdiff (0.3.7)
hashie (3.5.6)
hashie (3.5.7)
hike (1.2.3)
hitimes (1.2.6)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (0.9.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
ice_cube (0.11.1)
jquery-rails (4.3.1)
Expand All @@ -211,13 +211,13 @@ GEM
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kgio (2.11.0)
kgio (2.11.2)
language_list (1.2.1)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.4.1)
letter_opener (1.6.0)
launchy (~> 2.2)
loofah (2.1.1)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
Expand All @@ -226,7 +226,7 @@ GEM
activesupport (>= 3.1.0)
rack (>= 1.4.0)
rest-client
mas-rad_core (0.1.4)
mas-rad_core (0.1.5)
active_model_serializers
geocoder
httpclient
Expand All @@ -244,38 +244,38 @@ GEM
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.12.2)
multi_json (1.13.1)
multi_test (0.1.2)
multipart-post (2.0.0)
netrc (0.11.0)
nokogiri (1.8.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
oga (2.11)
oga (2.14)
ast
ruby-ll (~> 2.1)
orm_adapter (0.5.0)
parallel (1.12.1)
parser (2.4.0.2)
ast (~> 2.3)
parser (2.5.0.5)
ast (~> 2.4.0)
pg (0.21.0)
poltergeist (1.16.0)
poltergeist (1.17.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
polyamorous (1.3.1)
polyamorous (1.3.3)
activerecord (>= 3.0)
powerpack (0.1.1)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.5.0)
byebug (~> 9.1)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.1)
rack (1.6.8)
rack-protection (1.5.3)
public_suffix (3.0.2)
rack (1.6.9)
rack-protection (1.5.5)
rack
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -292,12 +292,12 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails_email_validator (0.1.4)
activemodel (>= 3.0.0)
railties (4.2.10)
Expand All @@ -309,12 +309,12 @@ GEM
rake
raindrops (0.19.0)
rake (11.3.0)
ransack (1.8.4)
ransack (1.8.8)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.3)
polyamorous (~> 1.3.2)
redis (4.0.1)
redis-namespace (1.6.0)
redis (>= 3.0.4)
Expand All @@ -329,7 +329,7 @@ GEM
multi_json
rspec-collection_matchers (1.1.3)
rspec-expectations (>= 2.99.0.beta1)
rspec-core (3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
Expand All @@ -345,7 +345,7 @@ GEM
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rspec-support (3.7.1)
rubocop (0.49.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
Expand Down Expand Up @@ -382,16 +382,15 @@ GEM
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
site_prism (2.9)
addressable (>= 2.3.3, < 3.0)
capybara (>= 2.1, < 3.0)
slack-ruby-client (0.10.0)
site_prism (2.11)
addressable (~> 2.4)
capybara (~> 2.7)
slack-ruby-client (0.11.1)
activesupport
faraday (>= 0.9)
faraday_middleware
gli
hashie
json
websocket-driver
sprockets (2.12.4)
hike (~> 1.2)
Expand All @@ -409,33 +408,33 @@ GEM
timecop (0.9.1)
timers (4.1.2)
hitimes
tzinfo (1.2.4)
tzinfo (1.2.5)
thread_safe (~> 0.1)
tzinfo-data (1.2017.3)
tzinfo-data (1.2018.4)
tzinfo (>= 1.0.0)
uglifier (3.2.0)
uglifier (4.1.8)
execjs (>= 0.3.0, < 3)
uk_phone_numbers (0.1.1)
uk_postcode (2.1.2)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
unicorn (5.3.1)
unicorn (5.4.0)
kgio (~> 2.6)
raindrops (~> 0.7)
vcr (3.0.3)
vcr (4.0.0)
warden (1.2.7)
rack (>= 1.0)
webmock (3.1.1)
webmock (3.3.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (2.1.0)
nokogiri (~> 1.3)
xpath (3.0.0)
nokogiri (~> 1.8)

PLATFORMS
ruby
Expand All @@ -452,8 +451,8 @@ DEPENDENCIES
capybara
cucumber-rails
database_cleaner
devise
devise_invitable
devise (= 3.5.10)
devise_invitable (= 1.6.1)
devise_security_extension
dough-ruby!
factory_girl_rails
Expand All @@ -464,9 +463,9 @@ DEPENDENCIES
launchy
letter_opener
mailjet
mas-rad_core (= 0.1.4)
mas-rad_core (= 0.1.5)
oga
pg
pg (= 0.21.0)
poltergeist
pry-byebug
pry-rails
Expand Down
1 change: 1 addition & 0 deletions script/docker_compose
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ image_name="rad_rails_1"
docker-compose pull
docker-compose build --force-rm
docker-compose up -d
docker-compose -f docker-compose.yml run --rm rails ./script/test

# docker logs will only run until the container exits
( docker logs --follow "$image_name" )&
Expand Down

0 comments on commit 587ec5a

Please sign in to comment.