Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Upgrade to Rails 3.2.x (3.2.7)

Changes in artefacts_controller were to override the
new default behaviour which was making it return a
no content response and a 204 status. Relevant commit:
rails/rails@aef62c4

Changes in integration_test_helper were because it
seemed to be getting into an infinite loop (although
the error was a SEGFAULT inside Rack).
Suspect it's from the Rack upgrade.
  • Loading branch information...
commit 6ef1600f73862eb8d68294d6c80d87e9b5ff4bbb 1 parent 173a607
Jamie Cobbett jamiecobbett authored
2  Gemfile
View
@@ -19,7 +19,7 @@ gem 'router-client', "3.1.0"
gem 'aws-ses', require: 'aws/ses'
-gem 'rails', '~> 3.1.7'
+gem 'rails', '3.2.7'
gem 'colorize', '~> 0.5.8'
gem 'rummageable', "~> 0.3.0"
80 Gemfile.lock
View
@@ -20,37 +20,36 @@ GEM
remote: https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/
specs:
PriorityQueue (0.1.2)
- actionmailer (3.1.7)
- actionpack (= 3.1.7)
- mail (~> 2.3.3)
- actionpack (3.1.7)
- activemodel (= 3.1.7)
- activesupport (= 3.1.7)
+ actionmailer (3.2.7)
+ actionpack (= 3.2.7)
+ mail (~> 2.4.4)
+ actionpack (3.2.7)
+ activemodel (= 3.2.7)
+ activesupport (= 3.2.7)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.6)
+ journey (~> 1.0.4)
+ rack (~> 1.4.0)
rack-cache (~> 1.2)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.4)
- activemodel (3.1.7)
- activesupport (= 3.1.7)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.7)
+ activesupport (= 3.2.7)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.7)
- activemodel (= 3.1.7)
- activesupport (= 3.1.7)
- arel (~> 2.2.3)
+ activerecord (3.2.7)
+ activemodel (= 3.2.7)
+ activesupport (= 3.2.7)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.7)
- activemodel (= 3.1.7)
- activesupport (= 3.1.7)
- activesupport (3.1.7)
- multi_json (>= 1.0, < 1.3)
+ activeresource (3.2.7)
+ activemodel (= 3.2.7)
+ activesupport (= 3.2.7)
+ activesupport (3.2.7)
+ i18n (~> 0.6)
+ multi_json (~> 1.0)
addressable (2.2.8)
ansi (1.4.1)
- arel (2.2.3)
+ arel (3.0.2)
aws-ses (0.4.4)
builder
mail (> 2.2.5)
@@ -131,6 +130,7 @@ GEM
hike (1.2.1)
httpauth (0.1)
i18n (0.6.0)
+ journey (1.0.4)
json (1.7.4)
jwt (0.1.5)
multi_json (>= 1.0)
@@ -142,7 +142,7 @@ GEM
activesupport
lrucache (0.1.3)
PriorityQueue (~> 0.1.2)
- mail (2.3.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -185,32 +185,30 @@ GEM
plek (0.3.0)
builder
polyglot (0.3.3)
- rack (1.3.6)
+ rack (1.4.1)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.7)
- actionmailer (= 3.1.7)
- actionpack (= 3.1.7)
- activerecord (= 3.1.7)
- activeresource (= 3.1.7)
- activesupport (= 3.1.7)
+ rails (3.2.7)
+ actionmailer (= 3.2.7)
+ actionpack (= 3.2.7)
+ activerecord (= 3.2.7)
+ activeresource (= 3.2.7)
+ activesupport (= 3.2.7)
bundler (~> 1.0)
- railties (= 3.1.7)
- railties (3.1.7)
- actionpack (= 3.1.7)
- activesupport (= 3.1.7)
+ railties (= 3.2.7)
+ railties (3.2.7)
+ actionpack (= 3.2.7)
+ activesupport (= 3.2.7)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
@@ -237,7 +235,7 @@ GEM
simplecov-html (0.5.3)
simplecov-rcov (0.2.3)
simplecov (>= 0.4.1)
- sprockets (2.0.4)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -250,7 +248,7 @@ GEM
test-unit (2.4.5)
therubyracer (0.9.10)
libv8 (~> 3.3.10)
- thor (0.14.6)
+ thor (0.15.4)
tilt (1.3.3)
treetop (1.4.10)
polyglot
@@ -307,7 +305,7 @@ DEPENDENCIES
nokogiri
null_logger
plek (~> 0.3.0)
- rails (~> 3.1.7)
+ rails (= 3.2.7)
router-client (= 3.1.0)
rummageable (~> 0.3.0)
shoulda (~> 2.11.3)
4 app/controllers/artefacts_controller.rb
View
@@ -60,7 +60,9 @@ def update
if saved && params[:commit] == 'Save and continue editing'
redirect_to edit_artefact_path(@artefact)
else
- respond_with @artefact, status: status_to_use
+ respond_with @artefact, status: status_to_use do |format|
+ format.json { render json: @artefact.to_json, status: status_to_use }
+ end
end
end
1  test/integration_test_helper.rb
View
@@ -22,3 +22,4 @@ def create_test_user
FactoryGirl.create(:user)
end
end
+
Please sign in to comment.
Something went wrong with that request. Please try again.