Skip to content

Commit

Permalink
Upgrade from Rails 3.2 to Rails4.2 (#578)
Browse files Browse the repository at this point in the history
* Configurations update for rails 4.0

* ActiveSupport::Testing::Performance extracted to a gem

* ruby prof required as a dependency

* disable rubocop on bin folder

* http patch

* Comment out to allow testing

* no longer supports plugin loading

* lock to sprockets 2.12

* Active record patches

* remove deprecated test syntax

* fix failing tests

* change new super class

* replace right_aws with right_aws_api

right_aws is no longer maintained, was throwing an error

* Change test lib to minitest, add  minitest reporters

* lock to rails 4.2.11.1

* change rails version in install script

* remove deprecation warnings

* make app work

* active record find patches

* root_in_json include defaulted to false

* confirm option removed in link helper

* cookies serializer changed to hybrid

* Change render :text to :plain

render :text will be deprecated and poses a security risk

* console for dev web

* Check and fix interface functionality

* fix export functionality

* add protected attributes for the warpable model

* fix image upload

* Fix comments and images failing tests

* include mass assignment security in annotations

* render html for update images

* clear mail array before every test

* Fix codeclimate issues

* skip failing test

The test is failing because of different names in model(warpable) and
controller(images) skipping this for now until we decide if we want to
standardize the names

* replace unprotected redirects

* fix fa icons

* fix login functionality

* precompile images

* fix codeclimate issues

* Fix oauth icons
  • Loading branch information
cesswairimu authored and jywarren committed Jun 13, 2019
1 parent 6c510e9 commit a671852
Show file tree
Hide file tree
Showing 62 changed files with 566 additions and 453 deletions.
17 changes: 9 additions & 8 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
version: 2
plugins:
rubocop:
plugins:
rubocop:
enabled: true
channel: rubocop-0-70
brakeman:
brakeman:
enabled: true
bundler-audit:
bundler-audit:
enabled: true
duplication:
duplication:
enabled: true
config:
languages:
- ruby:
- javascript:
eslint:
eslint:
enabled: true
fixme:
fixme:
enabled: true
rubocop:
rubocop:
enabled: true

exclude_patterns:
- config/
- db/
- vendor/
- log/
- bin/


1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ todo.txt
.sass-cache
.byebug_history
coverage_report/
test/reports/
17 changes: 12 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
source "https://rubygems.org"

ruby "2.4.6"
gem "rails", "~>3.2"
ruby '2.4.6'
gem 'rails', '4.2.11.1'
gem 'rake', '~> 12.3.2'
gem 'skylight'

gem "will_paginate", "3.1.7"
gem 'will_paginate-bootstrap4'
gem "friendly_id"
gem 'popper_js', '~> 1.11', '>= 1.11.1'
gem 'protected_attributes'

# dependencies
group :dependencies do
Expand All @@ -26,7 +27,9 @@ group :dependencies do
gem 'aws-sdk', '~> 1.5.7'

# for rake image migration tasks
gem 'right_aws'
# gem 'right_aws'
gem 'right_aws_api'


# compiling markdown to html
gem "rdiscount", "2.2.0.1"
Expand All @@ -40,10 +43,13 @@ group :dependencies do
end

group :test do
gem "rubocop", '~> 0.52.0'
gem "rubocop", '~> 0.64.0'
gem 'ruby-prof'
gem 'rails-perftest'
gem 'simplecov', require: false
gem 'simplecov-cobertura', require: false
gem 'test-unit'
gem 'minitest'
gem 'minitest-reporters'
end

group :development, :test do
Expand All @@ -55,6 +61,7 @@ end
group :development do
gem "jshintrb"
gem "therubyracer"
gem 'web-console', '~> 2.0'
end

group :sqlite do
Expand Down
Loading

0 comments on commit a671852

Please sign in to comment.