Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/bundler/rails-assets-angular-an…
Browse files Browse the repository at this point in the history 
…d-rails-assets-angular-route
  • Loading branch information
@digitaltom
digitaltom committed Mar 25, 2019
2 parents ee85f75 + f8b8177 commit 47f05f9
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem 'haml'
source 'https://rails-assets.org' do
gem 'rails-assets-angular', '1.7.5'
gem 'rails-assets-angular-route', '1.7.5'
gem 'rails-assets-lazysizes', '4.1.4'
gem 'rails-assets-lazysizes', '4.1.7'
end

gem 'uglifier', '>= 1.3.0'
Expand Down
88 changes: 44 additions & 44 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,36 @@ GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
actionmailer (4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
actionmailer (4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.11)
actionview (= 4.2.11)
activesupport (= 4.2.11)
actionpack (4.2.11.1)
actionview (= 4.2.11.1)
activesupport (= 4.2.11.1)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.11)
activesupport (= 4.2.11)
actionview (4.2.11.1)
activesupport (= 4.2.11.1)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.11)
activesupport (= 4.2.11)
activejob (4.2.11.1)
activesupport (= 4.2.11.1)
globalid (>= 0.3.0)
activemodel (4.2.11)
activesupport (= 4.2.11)
activemodel (4.2.11.1)
activesupport (= 4.2.11.1)
builder (~> 3.1)
activerecord (4.2.11)
activemodel (= 4.2.11)
activesupport (= 4.2.11)
activerecord (4.2.11.1)
activemodel (= 4.2.11.1)
activesupport (= 4.2.11.1)
arel (~> 6.0)
activesupport (4.2.11)
activesupport (4.2.11.1)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
Expand All @@ -45,14 +45,14 @@ GEM
angular_rails_csrf (3.2.0)
railties (>= 3, < 6)
ansi (1.5.0)
archive-zip (0.11.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
arel (6.0.4)
ast (2.4.0)
awesome_print (1.8.0)
builder (3.2.3)
byebug (10.0.2)
capybara (3.13.2)
byebug (11.0.1)
capybara (3.15.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
Expand All @@ -65,10 +65,10 @@ GEM
selenium-webdriver
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
chromedriver-helper (2.1.0)
chromedriver-helper (2.1.1)
archive-zip (~> 0.10)
nokogiri (~> 1.8)
concurrent-ruby (1.1.4)
concurrent-ruby (1.1.5)
config-parser (0.3.0)
coveralls (0.8.22)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -104,35 +104,35 @@ GEM
minitest (5.11.3)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
parallel (1.13.0)
parser (2.6.0.0)
parallel (1.15.0)
parser (2.6.2.0)
ast (~> 2.4.0)
pi_piper (2.0.0)
eventmachine (= 1.0.9)
ffi
powerpack (0.1.2)
psych (3.1.0)
public_suffix (3.0.3)
puma (3.12.0)
puma (3.12.1)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.6.11)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.11)
actionmailer (= 4.2.11)
actionpack (= 4.2.11)
actionview (= 4.2.11)
activejob (= 4.2.11)
activemodel (= 4.2.11)
activerecord (= 4.2.11)
activesupport (= 4.2.11)
rails (4.2.11.1)
actionmailer (= 4.2.11.1)
actionpack (= 4.2.11.1)
actionview (= 4.2.11.1)
activejob (= 4.2.11.1)
activemodel (= 4.2.11.1)
activerecord (= 4.2.11.1)
activesupport (= 4.2.11.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.11)
railties (= 4.2.11.1)
sprockets-rails
rails-assets-angular (1.7.5)
rails-assets-angular-route (1.7.5)
rails-assets-angular (= 1.7.5)
rails-assets-lazysizes (4.1.4)
rails-assets-lazysizes (4.1.7)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
Expand All @@ -141,9 +141,9 @@ GEM
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (4.2.11)
actionpack (= 4.2.11)
activesupport (= 4.2.11)
railties (4.2.11.1)
actionpack (= 4.2.11.1)
activesupport (= 4.2.11.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
Expand All @@ -166,14 +166,14 @@ GEM
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.64.0)
rubocop (0.66.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
unicode-display_width (>= 1.4.0, < 1.6)
ruby-progressbar (1.10.0)
rubyzip (1.2.2)
selenium-webdriver (3.12.0)
Expand Down Expand Up @@ -206,7 +206,7 @@ GEM
thread_safe (~> 0.1)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.4.1)
unicode-display_width (1.5.0)
xpath (3.2.0)
nokogiri (~> 1.8)

Expand All @@ -230,7 +230,7 @@ DEPENDENCIES
rails (~> 4.2)
rails-assets-angular (= 1.7.5)!
rails-assets-angular-route (= 1.7.5)!
rails-assets-lazysizes (= 4.1.4)!
rails-assets-lazysizes (= 4.1.7)!
rspec-rails
rubocop
simplecov
Expand Down

0 comments on commit 47f05f9

Please sign in to comment.