Merge branch 'release/release6.6'

jonmarinello · Mar 8, 2017 · 9b47bc4 · 9b47bc4
2 parents 220718a + 0948a90
commit 9b47bc4
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 69 deletions.
diff --git a/Gemfile b/Gemfile
@@ -74,6 +74,7 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'annotate'
+  # gem 'quiet_assets'
 end
 
 # Test dependencies
@@ -107,7 +108,6 @@ group :test, :development do
   gem 'awesome_print'
   gem 'better_errors'
   gem 'binding_of_caller'
-  # gem 'quiet_assets'
 end
 
 # Production dependencies

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/activeadmin/inherited_resources.git
-  revision: ba9467db4817944591df35dfe340f4c05a948033
+  revision: 4434f0ae72f790cf371728838c927c338100555d
   specs:
     inherited_resources (1.6.0)
       actionpack (>= 3.2, < 5.1)
@@ -11,29 +11,29 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      nio4r (~> 1.2)
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_admin_theme (1.0.3)
     activeadmin (1.0.0.pre4)
       arbre (~> 1.0, >= 1.0.2)
@@ -51,21 +51,21 @@ GEM
       sprockets (< 4)
     activeadmin-sortable (0.0.3)
       activeadmin (>= 0.4)
-    activejob (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
       arel (~> 7.0)
-    activesupport (5.0.0.1)
+    activesupport (5.0.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    acts_as_list (0.7.6)
+    acts_as_list (0.8.0)
       activerecord (>= 3.0)
     addressable (2.4.0)
     annotate (2.7.1)
@@ -74,8 +74,8 @@ GEM
     ansi (1.5.0)
     arbre (1.1.1)
       activesupport (>= 3.0.0)
-    arel (7.1.1)
-    autoprefixer-rails (6.4.0.2)
+    arel (7.1.4)
+    autoprefixer-rails (6.4.0.3)
       execjs
     awesome_print (1.7.0)
     bcrypt (3.1.11)
@@ -93,9 +93,9 @@ GEM
     bourbon (4.2.7)
       sass (~> 3.4)
       thor (~> 0.19)
-    builder (3.2.2)
+    builder (3.2.3)
     byebug (9.0.5)
-    capybara (2.7.1)
+    capybara (2.8.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -117,7 +117,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.5)
     css_parser (1.3.7)
       addressable
     debug_inspector (0.0.2)
@@ -155,9 +155,9 @@ GEM
       haml (~> 4.0.0)
       nokogiri (~> 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (0.7.0)
+    i18n (0.8.1)
     interception (0.5)
-    jquery-rails (4.1.1)
+    jquery-rails (4.2.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -177,7 +177,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.9.0)
+    minitest (5.10.1)
     minitest-capybara (0.8.2)
       capybara (~> 2.2)
       minitest (~> 5.0)
@@ -200,18 +200,16 @@ GEM
     minitest-spec-rails (5.4.0)
       minitest (~> 5.0)
       rails (>= 4.1)
-    newrelic_rpm (3.16.0.318)
-    nio4r (1.2.1)
-    nokogiri (1.6.8)
+    newrelic_rpm (3.16.2.321)
+    nio4r (2.0.0)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     orm_adapter (0.5.0)
     pg (0.18.4)
     phony (2.15.28)
     phony_rails (0.14.2)
       activesupport (>= 3.0)
       phony (~> 2.12)
-    pkg-config (1.1.7)
     polyamorous (1.3.1)
       activerecord (>= 3.0)
     pry (0.10.4)
@@ -232,40 +230,40 @@ GEM
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.1)
-      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.1)
+      railties (= 5.0.2)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.0)
+    rails-controller-testing (1.0.1)
       actionpack (~> 5.x)
       actionview (~> 5.x)
       activesupport (~> 5.x)
-    rails-dom-testing (2.0.1)
+    rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.17.0)
-    rake (11.2.2)
+    rake (11.3.0)
     ransack (1.8.2)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
@@ -302,7 +300,7 @@ GEM
     shoulda-context (1.2.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simple_form (3.2.1)
+    simple_form (3.3.0)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
     simplecov (0.12.0)
@@ -312,22 +310,22 @@ GEM
     simplecov-html (0.10.0)
     slop (3.6.0)
     spring (1.7.2)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.1.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
+    thor (0.19.4)
+    thread_safe (0.3.6)
     tilt (2.0.5)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.1)
+    uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
     unicorn (5.1.0)
       kgio (~> 2.6)
@@ -337,7 +335,7 @@ GEM
     warden (1.2.6)
       rack (>= 1.0)
     websocket (1.2.3)
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     xpath (2.0.0)
@@ -395,4 +393,4 @@ RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.5
+   1.14.6
diff --git a/app/views/pages/portfolio/_fin_and_field.html.haml b/app/views/pages/portfolio/_fin_and_field.html.haml
@@ -19,9 +19,6 @@
       using Ruby on Rails 4, Ruby 2.1, CSS, Bootstrap 3, AngularJS,
       Javascript, CoffeeScript, jQuery and HAML. We also integrated numerous third-party add-ons and external services
       including HireFire, New Relic, Mail Chimp, Google Maps and OptinMonster.
-    %strong
-      %p
-        This is a current engagement.
     %p
       %center
         = render 'shared/read_their_recommendations'
diff --git a/app/views/pages/portfolio/_procore.html.haml b/app/views/pages/portfolio/_procore.html.haml
@@ -19,3 +19,6 @@
     %strong
       %p
         This is a current engagement.
+    %p
+      %center
+        = render 'shared/read_their_recommendations'
diff --git a/lib/recommendation_loader.rb b/lib/recommendation_loader.rb
@@ -11,7 +11,7 @@ def self.load_recommendations
                            title: 'Kannan Manickam - Senior Software Engineer at RightScale, April 8, 2013',
                            body: '"Jon is an one-man-army in developing and maintaining code for the testing framework used here at RightScale to test the server configuration across different cloud vendors and operating systems using the API. He always has the passion for learning new tools, technologies, and integrating it with the product he builds.
                                    Whether it is day or night, He is available to support teams related to issues they have with the product he built and fixes them ASAP. Jon''s tireless work ethic and positive attitude make him a valuable professional. I would recommend Jon without hesitation."',
-                           image_url: 'https://media.licdn.com/media/p/1/005/020/215/2f128be.jpg')
+                           image_url: 'https://media.licdn.com/media/AAEAAQAAAAAAAAh5AAAAJGI4YjI3YzZlLWNhOTQtNGZhNS05OGE1LTIwZWQxYjhiZTQ4Zg.jpg')
 
     Recommendation.create!(name: 'nitin_mohan',
                            title: 'Nitin Mohan - Senior Software Engineer at RightScale, April 6, 2013',

diff --git a/test/controllers/admin/potential_projects_controller_test.rb b/test/controllers/admin/potential_projects_controller_test.rb
@@ -15,7 +15,7 @@ class Admin::PotentialProjectsControllerTest < ActionController::TestCase
 
     get :index
     assert_response :success
-    assert_equal admin_potential_projects_path, request.path
+    assert_equal admin_potential_projects_path, request.fullpath
   end
 
 
@@ -53,7 +53,7 @@ class Admin::PotentialProjectsControllerTest < ActionController::TestCase
 
     get :show, params: { id: '2' }
     assert_response :success
-    assert_equal admin_potential_project_path(assigns(:potential_project)), request.path
+    assert_equal admin_potential_project_path(assigns(:potential_project)), request.fullpath
   end
 
 

diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb
@@ -107,7 +107,7 @@ def common_get_test(page, page_template, title)
     assert_nil assigns(:active_tab)
     assert_not_nil assigns(:potential_project)
     assert_equal 'An Error occurred.', flash[:alert]
-    assert_equal pages_start_a_project_path, request.path
+    assert_equal pages_start_a_project_path, request.fullpath
   end