Merge branch 'release/0.40.2'

srve4 · Dec 24, 2014 · 13a24b2 · 13a24b2
2 parents 20a82f0 + 68efb2b
commit 13a24b2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ gem 'travis'
 gem 'sinatra'
 gem 'sinatra-flash'
 gem 'sinatra-contrib'
-gem 'shotgun', '~> 0.9'
+gem 'shotgun'
 gem 'zurb-foundation'
 gem 'compass'
 gem 'rake'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -114,7 +114,7 @@ DEPENDENCIES
   newrelic_rpm
   pony
   rake
-  shotgun (~> 0.9)
+  shotgun
   sinatra
   sinatra-contrib
   sinatra-flash

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# The Internet 0.40.1 (12-13-2014)
+# The Internet 0.40.2 (12-24-2014)
 =======
 
 An example application that captures prominent and ugly functionality found on the web. Perfect for writing automated acceptance tests against.

diff --git a/README.template b/README.template
@@ -1,4 +1,4 @@
-# The Internet 0.40.1 (12-13-2014)
+# The Internet 0.40.2 (12-24-2014)
 =======
 
 An example application that captures prominent and ugly functionality found on the web. Perfect for writing automated acceptance tests against.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.40.1
+0.40.2
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+#0.40.2
++ Added some semantic markup on the /dynamic_content page to make it easier for targeting individual rows in automated tests.
+
 #0.40.1
 + Fixed a bug in the /shifting_content random example and down-sized it all down to one route that handles all use cases (e.g., normal, random, and specified pixel count). Also added helper text with links to the view
 

diff --git a/views/dynamic_content.erb b/views/dynamic_content.erb
@@ -14,7 +14,7 @@
   </br>
 
   <div class='row'>
-    <div class='large-10 columns large-centered'>
+    <div id='content' class='large-10 columns large-centered'>
       <% @copy.each do |copy| %>
         <div class='row'>
           <div class='large-2 columns'>