diff --git a/play-with-docker/Portus/Gemfile b/play-with-docker/Portus/Gemfile index e23be3343..c527aa0e7 100644 --- a/play-with-docker/Portus/Gemfile +++ b/play-with-docker/Portus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "rails", "~> 4.2.8" -gem "sass-rails", ">= 3.2" +gem "rails", "~> 4.2.9" +gem "sass-rails", ">= 5.0.4" gem "bootstrap-sass", "~> 3.3.4" gem "slim" gem "pundit" @@ -9,9 +9,9 @@ gem "sprockets", "~> 2.12.3" gem "jwt" gem "base32" gem "active_model_serializers" -gem "devise" +gem "devise", ">= 4.9.0" gem "gravatar_image_tag" -gem "public_activity" +gem "public_activity", ">= 1.4.3" gem "active_record_union" gem "mysql2" gem "search_cop" @@ -19,9 +19,9 @@ gem "kaminari" gem "crono" gem "net-ldap" gem "redcarpet" -gem "font-awesome-rails" +gem "font-awesome-rails", ">= 4.5.0.0" gem "rails_stdout_logging", "~> 0.0.5", group: [:development, :staging, :production] -gem "webpack-rails" +gem "webpack-rails", ">= 0.9.11" # Pinning these specific versions because that's what we have on OBS. gem "ethon", "~> 0.9.0" @@ -31,7 +31,7 @@ gem "typhoeus", "~> 1.0.2" gem "bcrypt" # This is already a Rails dependency, but we use it to run portusctl -gem "thor" +gem "thor", ">= 1.4.0" # Assets group. # @@ -68,20 +68,20 @@ unless packaging? gem "pry-rails" gem "git-review", require: false gem "rack-mini-profiler", require: false - gem "guard", require: false - gem "guard-rubocop", require: false - gem "guard-rspec", require: false + gem "guard", ">= 2.14.0", require: false + gem "guard-rubocop", ">= 1.3.0", require: false + gem "guard-rspec", ">= 4.7.0", require: false end group :development, :test do - gem "rspec-rails" + gem "rspec-rails", ">= 3.3.2" gem "byebug" - gem "web-console", "~> 2.1.3" + gem "web-console", "~> 2.2.0" gem "awesome_print" gem "hirb" gem "wirb" gem "wirble" - gem "factory_girl_rails" + gem "factory_girl_rails", ">= 4.6.0" gem "ffaker" gem "rubocop", "~> 0.41.2", require: false gem "brakeman", require: false diff --git a/play-with-docker/Portus/Gemfile.lock b/play-with-docker/Portus/Gemfile.lock index 513547191..865871176 100644 --- a/play-with-docker/Portus/Gemfile.lock +++ b/play-with-docker/Portus/Gemfile.lock @@ -1,21 +1,21 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) + actionmailer (4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.8) - actionview (= 4.2.8) - activesupport (= 4.2.8) + actionpack (4.2.11.3) + actionview (= 4.2.11.3) + activesupport (= 4.2.11.3) 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.8) - activesupport (= 4.2.8) + actionview (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) @@ -24,17 +24,17 @@ GEM activemodel (>= 3.2) active_record_union (1.1.0) activerecord (>= 4.0) - activejob (4.2.8) - activesupport (= 4.2.8) + activejob (4.2.11.3) + activesupport (= 4.2.11.3) globalid (>= 0.3.0) - activemodel (4.2.8) - activesupport (= 4.2.8) + activemodel (4.2.11.3) + activesupport (= 4.2.11.3) builder (~> 3.1) - activerecord (4.2.8) - activemodel (= 4.2.8) - activesupport (= 4.2.8) + activerecord (4.2.11.3) + activemodel (= 4.2.11.3) + activesupport (= 4.2.11.3) arel (~> 6.0) - activesupport (4.2.8) + activesupport (4.2.11.3) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -44,15 +44,15 @@ GEM activerecord (>= 2.3.0) rake (>= 0.8.7) arel (6.0.4) - ast (2.3.0) + ast (2.4.3) autoprefixer-rails (5.2.0.1) execjs json awesome_print (1.6.1) base32 (0.3.2) - bcrypt (3.1.18) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) + bcrypt (3.1.20) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) binman (5.1.0) opener (>= 0.1.0, < 1) bootstrap-sass (3.3.5) @@ -68,7 +68,7 @@ GEM sass (~> 3.0) slim (>= 1.3.6, < 4.0) terminal-table (~> 1.4) - builder (3.2.4) + builder (3.3.0) byebug (5.0.0) columnize (= 0.9.0) capybara (2.4.4) @@ -81,9 +81,9 @@ GEM cliver (0.3.2) codeclimate-test-reporter (0.4.7) simplecov (>= 0.7.1, < 1.0.0) - coderay (1.1.0) + coderay (1.1.3) columnize (0.9.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.5) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -91,14 +91,15 @@ GEM activerecord (~> 4.0) activesupport (~> 4.0) database_cleaner (1.4.1) - debug_inspector (0.0.2) - devise (4.8.1) + date (3.4.1) + debug_inspector (1.2.0) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.2.5) + diff-lcs (1.6.2) docile (1.1.5) docker-api (1.28.0) excon (>= 0.38.0) @@ -108,18 +109,18 @@ GEM ffi (>= 1.3.0) excon (0.49.0) execjs (2.2.2) - factory_girl (4.5.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.5.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) faraday (0.9.1) multipart-post (>= 1.2, < 3) ffaker (2.0.0) - ffi (1.9.10) - font-awesome-rails (4.4.0.0) - railties (>= 3.2, < 5.0) - formatador (0.2.5) + ffi (1.17.2) + font-awesome-rails (4.7.0.9) + railties (>= 3.2, < 9.0) + formatador (1.1.1) git-review (2.0.0) gli (~> 2.8.0) hashie @@ -130,26 +131,27 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) gravatar_image_tag (1.2.0) - guard (2.13.0) + guard (2.19.1) formatador (>= 0.2.4) - listen (>= 2.7, <= 4.0) - lumberjack (~> 1.0) + listen (>= 2.7, < 4.0) + logger (~> 1.6) + lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) - pry (>= 0.9.12) + ostruct (~> 0.6) + pry (>= 0.13.0) shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-rspec (4.6.5) + guard-rspec (4.7.3) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - guard-rubocop (1.2.0) + guard-rubocop (1.5.0) guard (~> 2.0) - rubocop (~> 0.20) + rubocop (< 2.0) haml (4.0.7) tilt - hashdiff (0.3.2) hashie (3.4.2) highline (1.7.8) hike (1.2.3) @@ -165,44 +167,58 @@ GEM activesupport (>= 3.0.0) launchy (2.4.3) addressable (~> 2.3) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) - loofah (2.19.1) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) + loofah (2.24.1) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - lumberjack (1.0.10) - mail (2.7.1) + nokogiri (>= 1.12.0) + lumberjack (1.3.1) + mail (2.8.1) mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp md2man (5.1.1) binman (~> 5.0) redcarpet (~> 3.0) rouge (~> 1.0) - method_source (0.8.2) + method_source (1.1.0) mime-types (3.3) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mini_mime (1.0.2) - mini_portile2 (2.8.1) - minitest (5.16.3) - multi_json (1.11.2) + mini_mime (1.1.5) + mini_portile2 (2.8.9) + minitest (5.25.5) + multi_json (1.15.0) multipart-post (2.0.0) mysql2 (0.3.18) nenv (0.3.0) + net-imap (0.4.22) + date + net-protocol net-ldap (0.11) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.5.1) + net-protocol + nokogiri (1.15.7) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - notiffany (0.0.8) + notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) octokit (2.0.0) sawyer (~> 0.3.0) opener (0.1.0) orm_adapter (0.5.0) + ostruct (0.6.3) paint (1.0.0) - parser (2.3.1.2) - ast (~> 2.2) + parser (2.7.2.0) + ast (~> 2.4.1) phantomjs (2.1.1.0) poltergeist (1.6.0) capybara (~> 2.1) @@ -210,14 +226,13 @@ GEM multi_json (~> 1.0) websocket-driver (>= 0.2.0) polyglot (0.3.5) - powerpack (0.1.1) - pry (0.10.1) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) + powerpack (0.1.3) + pry (0.15.2) + coderay (~> 1.1) + method_source (~> 1.0) pry-rails (0.3.4) pry (>= 0.9.10) - public_activity (1.4.2) + public_activity (1.6.4) actionpack (>= 3.0.0) activerecord (>= 3.0) i18n (>= 0.5.0) @@ -227,22 +242,22 @@ GEM activesupport (>= 3.0.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - racc (1.6.2) + racc (1.8.1) rack (1.6.13) rack-mini-profiler (0.9.3) rack (>= 1.1.3) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.8) - actionmailer (= 4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - activemodel (= 4.2.8) - activerecord (= 4.2.8) - activesupport (= 4.2.8) + rails (4.2.11.3) + actionmailer (= 4.2.11.3) + actionpack (= 4.2.11.3) + actionview (= 4.2.11.3) + activejob (= 4.2.11.3) + activemodel (= 4.2.11.3) + activerecord (= 4.2.11.3) + activesupport (= 4.2.11.3) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.8) + railties (= 4.2.11.3) sprockets-rails rails-deprecated_sanitizer (1.0.4) activesupport (>= 4.2.0.alpha) @@ -255,45 +270,47 @@ GEM activesupport (>= 3.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) rails_stdout_logging (0.0.5) - railties (4.2.8) - actionpack (= 4.2.8) - activesupport (= 4.2.8) + railties (4.2.11.3) + actionpack (= 4.2.11.3) + activesupport (= 4.2.11.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - rake (13.0.6) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - ffi (>= 0.5.0) + rainbow (2.2.2) + rake + rake (13.3.0) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) + ffi (~> 1.0) redcarpet (3.3.3) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) rouge (1.11.1) - rspec (3.3.0) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-core (3.3.0) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.0) + rspec (3.13.1) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.5) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-mocks (3.3.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.1) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) + rspec-support (~> 3.13.0) + rspec-rails (4.1.2) + actionpack (>= 4.2) + activesupport (>= 4.2) + railties (>= 4.2) + rspec-core (~> 3.10) + rspec-expectations (~> 3.10) + rspec-mocks (~> 3.10) + rspec-support (~> 3.10) + rspec-support (3.13.4) rubocop (0.41.2) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) @@ -301,20 +318,24 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-graphviz (1.2.2) - ruby-progressbar (1.8.1) + ruby-progressbar (1.13.0) ruby2ruby (2.3.0) ruby_parser (~> 3.1) sexp_processor (~> 4.0) ruby_parser (3.8.1) sexp_processor (~> 4.1) safe_yaml (1.0.4) - sass (3.4.13) - sass-rails (5.0.3) - railties (>= 4.0.0, < 5.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) + tilt (>= 1.1, < 3) sawyer (0.3.0) faraday (~> 0.8, < 0.10) uri_template (~> 0.5.0) @@ -336,8 +357,7 @@ GEM slim (2.0.2) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) - slop (3.6.0) - sprockets (2.12.4) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -348,25 +368,26 @@ GEM sprockets (>= 2.8, < 4.0) temple (0.6.7) terminal-table (1.5.2) - thor (1.2.1) + thor (1.4.0) thread_safe (0.3.6) tilt (1.4.1) timecop (0.7.4) + timeout (0.4.3) treetop (1.6.5) polyglot (~> 0.3) typhoeus (1.0.2) ethon (>= 0.9.0) - tzinfo (1.2.10) + tzinfo (1.2.11) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - unicode-display_width (1.1.0) + unicode-display_width (1.8.0) uri_template (0.5.3) vcr (3.0.3) warden (1.2.7) rack (>= 1.0) - web-console (2.1.3) + web-console (2.2.1) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) @@ -374,8 +395,7 @@ GEM webmock (2.3.2) addressable (>= 2.3.6) crack (>= 0.3.2) - webpack-rails (0.9.10) - hashdiff + webpack-rails (0.9.11) railties (>= 3.2.0) websocket-driver (0.5.4) websocket-extensions (>= 0.1.0) @@ -405,17 +425,17 @@ DEPENDENCIES codeclimate-test-reporter crono database_cleaner - devise + devise (>= 4.9.0) docker-api (~> 1.28.0) ethon (~> 0.9.0) - factory_girl_rails + factory_girl_rails (>= 4.6.0) ffaker - font-awesome-rails + font-awesome-rails (>= 4.5.0.0) git-review gravatar_image_tag - guard - guard-rspec - guard-rubocop + guard (>= 2.14.0) + guard-rspec (>= 4.7.0) + guard-rubocop (>= 1.3.0) hirb json-schema jwt @@ -426,31 +446,31 @@ DEPENDENCIES phantomjs (~> 2.1.1.0) poltergeist pry-rails - public_activity + public_activity (>= 1.4.3) puma (~> 3.7.0) pundit quiet_assets rack-mini-profiler - rails (~> 4.2.8) + rails (~> 4.2.9) rails-erd rails_stdout_logging (~> 0.0.5) redcarpet - rspec-rails + rspec-rails (>= 3.3.2) rubocop (~> 0.41.2) - sass-rails (>= 3.2) + sass-rails (>= 5.0.4) search_cop shoulda simplecov slim sprockets (~> 2.12.3) - thor + thor (>= 1.4.0) timecop typhoeus (~> 1.0.2) uglifier vcr - web-console (~> 2.1.3) + web-console (~> 2.2.0) webmock (~> 2.3.2) - webpack-rails + webpack-rails (>= 0.9.11) wirb wirble