Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Rails to 3.2.19 #3

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

Bump Rails to 3.2.19 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6b23a78
Bump Rails to 3.2.19
JordanHatch Jul 21, 2014
f3a62cf
Use Ruby 2.2.2
JordanHatch Jul 6, 2015
b6d5f94
Update to Rails 4.0.x
JordanHatch Jul 6, 2015
06c6b47
Update Bundle.require statement
JordanHatch Jul 6, 2015
5089790
Remove .rbenv-version file
JordanHatch Jul 6, 2015
7a17917
Add binstubs
JordanHatch Jul 6, 2015
a0608d2
Remove vendor/plugins directory
JordanHatch Jul 6, 2015
90514dc
Convert scopes to use block format
JordanHatch Jul 6, 2015
0397ef6
Add secret_key_base
JordanHatch Jul 6, 2015
59cbeed
Update environment settings for Rails 4
JordanHatch Jul 6, 2015
5c8a17b
Regenerate Devise config
JordanHatch Jul 6, 2015
e44e5e9
Update specs to RSpec 3.x format
JordanHatch Jul 6, 2015
d6c4fa4
Remove whiny_nils config in test.rb
JordanHatch Jul 6, 2015
86e3c7e
Simplify local db configuration
JordanHatch Jul 6, 2015
3eca4c4
Refactor test helpers
JordanHatch Jul 7, 2015
59ebab6
Update models for Rails 4
JordanHatch Jul 7, 2015
2a8b49f
Refactor Admin#EventsController
JordanHatch Jul 7, 2015
091ccc8
Update ProjectsController spec
JordanHatch Jul 7, 2015
5e3cbfb
Refactor Admin#ProjectsController
JordanHatch Jul 7, 2015
ad73656
Use strong parameters in ProjectsController
JordanHatch Jul 7, 2015
54bbba1
Update Event model spec
JordanHatch Jul 7, 2015
f948947
Update Project model spec
JordanHatch Jul 7, 2015
008f10f
Remove .rvmrc file
JordanHatch Jul 7, 2015
cf55c60
Update Paperclip gem, and add Puma
JordanHatch Jul 7, 2015
17575e2
Simplify project secret behaviour
JordanHatch Jul 7, 2015
b653c16
Remove attr_accessible from Admin model
JordanHatch Jul 7, 2015
81494b4
Don't set defaults for Project anymore
JordanHatch Jul 7, 2015
836722f
Update to Rails 4.2.3
JordanHatch Jul 7, 2015
29f2a61
Update ProjectsHelper spec with new syntax
JordanHatch Jul 7, 2015
5d41361
Update ProjectsHelper spec with new syntax
JordanHatch Jul 7, 2015
5c787c3
Refactor EventsController and spec
JordanHatch Jul 7, 2015
acd9d21
Add nested params for centres/awards to whitelist
JordanHatch Jul 7, 2015
31d3012
Update syntax in AwardCategory spec
JordanHatch Jul 7, 2015
72cb358
Separate local database configuration
JordanHatch Jul 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .rbenv-version
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.2.2
55 changes: 0 additions & 55 deletions .rvmrc
View file
Open in desktop

This file was deleted.

19 changes: 9 additions & 10 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
source 'http://rubygems.org'

gem 'rails', '~> 3.2.12'
gem 'rails', '~> 4.2.3'
gem 'unicorn'

gem 'pg'

gem 'json', '1.7.7'
gem 'jquery-rails'

gem "aws-sdk", "~> 1.8.3.1"
Expand All @@ -14,22 +13,22 @@ gem "breadcrumbs", "~> 0.1.6"
gem "comma", "~> 3.0.4"

gem "rdiscount", "~> 1.6.8"
gem "paperclip", "~> 2.4"
gem "paperclip"

gem 'paper_trail', '~> 2'
gem 'paper_trail', '~> 3.0.3'

# admin

gem "devise", "~> 2.0.5"
gem "devise", "~> 3.0"
gem "inherited_resources"

gem "formtastic", "~> 2.2"
gem "nested_form", :git => "git://github.com/ryanb/nested_form.git"

group :assets do
gem 'sass-rails', '~> 3.2.5'
gem 'uglifier', '>= 1.0.3'
end
gem 'sass-rails', '~> 4.0.3'
gem 'uglifier', '>= 1.0.3'

gem 'puma'

group :test do
gem 'cucumber-rails', require: false
Expand All @@ -38,6 +37,6 @@ group :test do
end

group :development, :test do
gem 'rspec-rails', '~> 2.6'
gem 'rspec-rails', '~> 3.1'
gem 'capybara'
end
Loading