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.

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

The Great Migration: Rails v4.2 #235

Merged
merged 42 commits into from
Mar 26, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
539774a
Gemfile updated to rails 4.2
juanpabloe Feb 28, 2015
1788188
[WIP] updated with rails4.2 boilerplate config files
juanpabloe Mar 9, 2015
a954491
updates aws-s3 gem
juanpabloe Mar 9, 2015
43d7221
[WIP] starting to migrate attr_accessible to strong params
juanpabloe Mar 9, 2015
cbcd84a
Removed attr_accessible from models
abisosa Mar 9, 2015
0d4065f
Updated old model scopes definition
abisosa Mar 10, 2015
a1d38d1
Fix service request model and spec
abisosa Mar 11, 2015
a9a9f48
Fix admin model spec
abisosa Mar 11, 2015
d3a80f2
Fix controllers specs
abisosa Mar 11, 2015
7655aa1
Fix assets inclusion (jquery plugins)
abisosa Mar 11, 2015
ce0d1ea
Added rails_helper for rspec
abisosa Mar 11, 2015
3e990ab
Fix strong params for service creation and update
abisosa Mar 11, 2015
c5450c8
Changed rspec expectations syntax
abisosa Mar 11, 2015
8253949
Changed rspec expectations syntax on manage_services_requests
abisosa Mar 11, 2015
29ce48b
Fix strong params for admin service requests controller
abisosa Mar 11, 2015
52a8b11
Changed rspec expectations syntax on manage_status
abisosa Mar 11, 2015
a571ffd
Fix strong params on statuses_controller
abisosa Mar 11, 2015
2dd7b2c
Changed rspec expectations syntax on registration_spec
abisosa Mar 11, 2015
235a157
Fix strong params for registrations_controller
abisosa Mar 11, 2015
82a7a1f
Update twitter gem configuration
abisosa Mar 11, 2015
decd6e1
Changed rspec expectations syntax on feature specs
abisosa Mar 12, 2015
8dd5a1b
Exclude fog credentials from test environment
abisosa Mar 12, 2015
dcb4231
Added spec for service request creation
abisosa Mar 12, 2015
aeec000
Changed current path expectations on service_requests_spec
abisosa Mar 12, 2015
ec71bcf
Fix: theme selection by admin
abisosa Mar 17, 2015
1cb5816
Changed application.js to coffeescript
abisosa Mar 17, 2015
5499bf9
Fix failing test and seeds with right constraints
abisosa Mar 17, 2015
c0b1474
Change expectations syntax on user_mailer_spec
abisosa Mar 17, 2015
8736a0a
Can't delete service when it has associated requests
abisosa Mar 17, 2015
0acf9c4
WIP: Fix for highcharts loading error
abisosa Mar 18, 2015
ad0015e
Fix failing google maps render
abisosa Mar 19, 2015
0a69202
Changed ifs to each on selectors that may appear in the dom
abisosa Mar 19, 2015
9c5218a
Fix loading report map when container is not loaded
abisosa Mar 19, 2015
60a2112
Fix strong params to accept service_fields hash with unknown keys
abisosa Mar 19, 2015
f317b7b
Added default value for service_field param
abisosa Mar 19, 2015
8b60fb6
Fix user service request managing spec
abisosa Mar 19, 2015
c2b1883
Rename users specs to run with rspec
abisosa Mar 19, 2015
7577107
Fix user dashboard specs
abisosa Mar 20, 2015
370de48
Fix user account flow specs (sign in and log in with twitter)
abisosa Mar 20, 2015
57651bc
Refactor status data for highchart chart, fix js index dependency
abisosa Mar 23, 2015
94bbde3
Fix bounding box map loading
abisosa Mar 23, 2015
c5359bd
Updates dependencies on README
juanpabloe Mar 26, 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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
/db/*.sqlite3

# Ignore all logfiles and tempfiles.
/log/*.log
/log/*
!/log/.keep
/tmp
.DS_Store
.sass-cache/
Expand Down
39 changes: 23 additions & 16 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ source 'https://rubygems.org'

ruby '2.1.5'

gem 'rails', '3.2.16'
gem 'rails', '4.2.0'

gem 'pg'
gem 'devise', '2.2.4'
gem 'devise'
gem 'nested_form'
gem 'geocoder'
gem "highcharts-rails", "~> 3.0.0"
Expand All @@ -20,7 +20,7 @@ gem 'omniauth-twitter'
gem 'carrierwave'
gem 'mini_magick'
gem 'fog'
gem 'aws-s3'
gem 'aws-sdk', '< 2.0'
gem 'kaminari'
gem 'thumbs_up'
gem 'gravatar-ultimate'
Expand All @@ -38,20 +38,24 @@ group :test do
gem 'database_cleaner'
gem 'launchy'
gem 'capybara'
gem 'selenium-webdriver', "~> 2.38.0"
gem 'selenium-webdriver'
end

group :development,:test do
gem 'factory_girl_rails'
gem 'rspec-rails'
gem 'shoulda-matchers'
gem 'byebug'
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'
# Spring speeds up development by keeping your application running in the background
gem 'spring'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'thin'
gem 'byebug'
gem 'letter_opener'
gem 'quiet_assets'
gem 'guard'
Expand All @@ -63,14 +67,17 @@ group :production do
gem 'unicorn'
end

# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'haml-rails'
gem 'compass-rails'
gem "modular-scale", "~> 1.0.6"
gem 'bootstrap-sass', '~> 3.0.0.0.rc'
gem 'uglifier', '>= 1.0.3'
end
# Assets
gem 'sass-rails', '~> 5.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'haml-rails'
gem 'compass-rails'
gem "modular-scale", "~> 1.0.6"
gem 'bootstrap-sass', '~> 3.0.0.0.rc'
gem 'uglifier', '>= 1.3.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', platforms: :ruby

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
Loading