Merge branch 'hotfix/odestep'

programming-life · Jun 9, 2013 · 6c486a1 · 6c486a1
2 parents d2eeb8f + d2662ca
commit 6c486a1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/assets/javascripts/MVC.js.coffee b/app/assets/javascripts/MVC.js.coffee
@@ -6,8 +6,8 @@
 (exports ? this).GIGABASE_VERSION = 
 	major: 1
 	minor: 5
-	revision: 4
-	full: '1.5.4'
+	revision: 5
+	full: '1.5.5'
 
 document.mvc = null
 

diff --git a/app/controllers/hook_controller.rb b/app/controllers/hook_controller.rb
@@ -33,7 +33,7 @@ def post
 
 	def version
 		respond_to do | format |
-			format.json { render json: { major: 1, minor: 5, revision: 4, full: '1.5.4' } }
+			format.json { render json: { major: 1, minor: 5, revision: 5, full: '1.5.5' } }
 		end
 	end
 

diff --git a/spec/javascripts/numeric_spec.js b/spec/javascripts/numeric_spec.js
@@ -99,7 +99,7 @@ describe("Numeric", function() {
 
 		it("should have cancelled messages", function() {
 			runs( function() {
-				expect( results.msg ).toMatch( 'cancelled' );
+				expect( results.msg ).toMatch( 'Cancelled' );
 			});
 		});