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

Upgrade from Rails 3.2 to Rails4.2 #578

Merged
merged 40 commits into from
Jun 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
da8b7b5
ActiveSupport::Testing::Performance extracted to a gem
cesswairimu May 5, 2019
7dcabea
ruby prof required as a dependency
cesswairimu May 5, 2019
d2e7ba5
Configurations update for rails 4.0
cesswairimu May 5, 2019
a783e6d
disable rubocop on bin folder
cesswairimu May 5, 2019
74ca822
http patch
cesswairimu May 5, 2019
683a6a9
Comment out to allow testing
cesswairimu May 5, 2019
d7a2a38
no longer supports plugin loading
cesswairimu May 5, 2019
6a77def
lock to sprockets 2.12
cesswairimu May 5, 2019
7a91780
Active record patches
cesswairimu May 5, 2019
5bcded3
remove deprecated test syntax
cesswairimu May 6, 2019
0d2ca09
fix failing tests
cesswairimu May 7, 2019
6d278f5
change new super class
cesswairimu May 7, 2019
d58db7d
replace right_aws with right_aws_api
cesswairimu May 9, 2019
3212ccf
lock to rails 4.2.11.1
cesswairimu May 14, 2019
ae7b4cf
change rails version in install script
cesswairimu May 14, 2019
4c54e24
remove deprecation warnings
cesswairimu May 14, 2019
995a098
make app work
cesswairimu May 14, 2019
40680ca
Change test lib to minitest, add minitest reporters
cesswairimu May 11, 2019
aff10ca
active record find patches
cesswairimu May 15, 2019
d93fcb2
root_in_json include defaulted to false
cesswairimu May 16, 2019
06f658d
confirm option removed in link helper
cesswairimu May 16, 2019
8fb43ed
cookies serializer changed to hybrid
cesswairimu May 16, 2019
93bd12f
Change render :text to :plain
cesswairimu May 16, 2019
af4959c
console for dev web
cesswairimu May 16, 2019
f9686e0
Check and fix interface functionality
cesswairimu May 18, 2019
a1c78a2
fix export functionality
cesswairimu May 21, 2019
f0b511e
add protected attributes for the warpable model
cesswairimu May 28, 2019
c2a65eb
fix image upload
cesswairimu May 31, 2019
3b49b0f
Fix comments and images failing tests
cesswairimu Jun 1, 2019
c074876
include mass assignment security in annotations
cesswairimu Jun 4, 2019
e36050a
render html for update images
cesswairimu Jun 4, 2019
efdb6d6
clear mail array before every test
cesswairimu Jun 4, 2019
cc6559d
Fix codeclimate issues
cesswairimu Jun 5, 2019
382040e
skip failing test
cesswairimu Jun 7, 2019
2c6efa7
replace unprotected redirects
cesswairimu Jun 7, 2019
11328c5
fix fa icons
cesswairimu Jun 7, 2019
7bf898f
fix login functionality
cesswairimu Jun 7, 2019
1515176
precompile images
cesswairimu Jun 7, 2019
a86d209
fix codeclimate issues
cesswairimu Jun 7, 2019
20d0ba2
Fix oauth icons
kaustubh-nair Jun 10, 2019
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
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