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 to Rails 5.2 #685

Merged
merged 48 commits into from
Jul 3, 2019
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
1d1211f
Upgrade Gemfile to Rails 5.0
kaustubh-nair Jun 12, 2019
13cdef5
require rake'
kaustubh-nair Jun 12, 2019
c20a903
Change config files
kaustubh-nair Jun 12, 2019
5a28772
Add application record
kaustubh-nair Jun 12, 2019
df7b02f
Bump mysql
kaustubh-nair Jun 12, 2019
3385812
Merge branch 'development' of https://github.com/publiclab/mapknitter…
alaxalves Jun 13, 2019
4fb5be3
Locking newer Rails v
alaxalves Jun 13, 2019
d058ce3
Running update task
alaxalves Jun 13, 2019
d90db0e
Adding missing bootsnap gem
alaxalves Jun 13, 2019
6e28143
Merge branch 'development' of https://github.com/publiclab/mapknitter…
alaxalves Jun 13, 2019
6545537
Fixing missing database
alaxalves Jun 13, 2019
24bd1f7
Adding missing listen gem
alaxalves Jun 13, 2019
e60bb83
Fixing schema example version
alaxalves Jun 13, 2019
6bedcc1
Fixing migration versions
alaxalves Jun 13, 2019
2c746c1
Updating dependencies for Rails 5
alaxalves Jun 19, 2019
88b3c8a
Adding ApplicationMailer abstraction
alaxalves Jun 19, 2019
17f8e88
Adding required initializers
alaxalves Jun 19, 2019
463fd8d
Prefer require_relative instead of full path
alaxalves Jun 19, 2019
154f8b5
Making associations not required by default
alaxalves Jun 19, 2019
c9e8b1b
Merge branch 'development' of https://github.com/publiclab/mapknitter…
alaxalves Jun 19, 2019
bccec1b
Regenerating schema file
alaxalves Jun 19, 2019
f678d95
Hotfixing MassAssigment
alaxalves Jun 19, 2019
f39d468
Upgrade web-console, remove mysql adapter override
kaustubh-nair Jun 20, 2019
c1837f1
Remove attr_accessible
kaustubh-nair Jun 20, 2019
cfca3ce
Add rails-controller-testing gem
kaustubh-nair Jun 20, 2019
47ce35a
Follow new syntax for tests
kaustubh-nair Jun 20, 2019
10cec89
Fix conflicts
kaustubh-nair Jun 20, 2019
ca9a118
Remove extra web-console from gemfile
kaustubh-nair Jun 20, 2019
d86282c
Regenerating lock file
alaxalves Jun 21, 2019
616f1fe
Fixing rubocop offenses and bundler version
alaxalves Jun 21, 2019
2495a8a
Using correct Paperclip class as in https://github.com/rails/rails/is…
alaxalves Jun 21, 2019
b2fdaea
Fix images functional tests
kaustubh-nair Jun 25, 2019
03bcfd3
images controller test typecast to string
kaustubh-nair Jun 25, 2019
672fabd
Fix rails logger
kaustubh-nair Jun 25, 2019
a146edb
Fix map tests
kaustubh-nair Jun 25, 2019
3a10c73
Bumping rubocop version
alaxalves Jun 27, 2019
e2e17e5
Autofixing rubocop offenses
alaxalves Jun 27, 2019
1340e4d
Including performance cop to rubocop
alaxalves Jun 27, 2019
37efb69
Refactoring deprecated routing and secret_token
alaxalves Jun 27, 2019
d81e8e0
Fixing routes for feed controller
alaxalves Jun 27, 2019
87bb313
Using correct routes for RSS builder
alaxalves Jun 27, 2019
a5726c7
Fixing missing routes
alaxalves Jun 28, 2019
b0b1dc0
Fixing travis bundler and yarn cache
alaxalves Jun 28, 2019
6cfd543
Fixing bundle path
alaxalves Jun 28, 2019
4fa14f2
Splitting bundle and yarn verifications
alaxalves Jun 29, 2019
5db0ac9
Merge branch 'development' of https://github.com/publiclab/mapknitter…
alaxalves Jul 2, 2019
6cf32f7
Fixing prod host for travis, private class usage and rubocop offenses
alaxalves Jul 3, 2019
8512b65
Merge branch 'development' of https://github.com/publiclab/mapknitter…
alaxalves Jul 3, 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: 11 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ install:
- cp db/schema.rb.example db/schema.rb
- ./lib/exporter-deps.sh > /dev/null 2>&1
- bundle install && yarn install
- mysql -e "CREATE DATABASE mapknitter_dev; CREATE DATABASE mapknitter_test;"
- rails db:create
- if [ $RAILS_ENV == 'production' ]; then
bundle exec rake db:create;
bundle exec rails db:schema:load;
else
bundle exec rake db:setup || bundle exec rake db:migrate;
bundle exec rails db:setup || bundle exec rails db:migrate;
fi

env:
Expand All @@ -29,22 +31,25 @@ env:
- CI=true
- TRAVIS=true

# FIXME - Later change 'test/unit' and 'test/funcional' folders
# to 'test/unit' and 'test/funcional', respectively

jobs:
include:
- name: "Unit Tests"
script: bundle exec rake test:unit
script: bundle exec rails test:unit
- name: "Integration Tests"
script: bundle exec rake test:integration
script: bundle exec rails test:integration
- name: "Functional Tests"
script: bundle exec rake test:functional
script: bundle exec rails test:functional
- name: "Rubocop Linter"
script: bundle exec rubocop
- name: "Docker Builds"
script: docker build -t mapknitter .
- name: "Asset Precompilation"
env:
- RAILS_ENV=production
script: bundle exec rake assets:precompile
script: bundle exec rails assets:precompile

branches:
only:
Expand Down
64 changes: 36 additions & 28 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,79 +1,87 @@
source "https://rubygems.org"
source 'https://rubygems.org'

ruby '2.4.6'
gem 'rails', '4.2.11.1'
gem 'rails', '~> 5.2.3'
gem 'rake', '~> 12.3.2'
gem 'skylight'
gem 'skylight', '~> 4.0.2'

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

# dependencies
group :dependencies do
gem 'mysql2', '< 0.4'
gem "geokit-rails", "1.1.4"
gem 'mysql2', '< 0.6'
gem 'geokit-rails', '1.1.4'
gem 'image_science', '1.3.0'
gem "recaptcha", :require => "recaptcha/rails"
gem "oa-openid", "0.3.2"
gem "ruby-openid", "~>2.5"
gem "open_id_authentication"
gem "RubyInline"
gem "paperclip", "~>4.3.7"
gem 'recaptcha', '~> 4.14.0', require: 'recaptcha/rails'
gem 'oa-openid', '0.3.2'
gem 'ruby-openid', '~>2.5'
gem 'open_id_authentication'
gem 'RubyInline', '~> 3.12.4'
gem 'paperclip'
gem 'bootsnap', '~> 1.4.4'
gem 'turbolinks', '~> 5'
gem 'mini_magick', '~> 4.8'

# if you use amazon s3 for warpable image storage
gem 'aws-sdk', '~> 1.5.7'

# for rake image migration tasks
# gem 'right_aws'
gem 'right_aws_api'
gem 'right_aws_api', '~> 0.3.5'

# compiling markdown to html
gem "rdiscount", "2.2.0.1"
gem 'rdiscount', '2.2.0.1'

# asset pipelining
gem 'bootstrap-sass'
gem 'sassc-rails'
gem 'jquery-rails'
gem "sprockets"
gem 'sprockets', '3.7.2'
gem "sprockets-rails"
gem "sass", :require => 'sass'
gem "autoprefixer-rails"
gem "uglifier"
gem 'sass', require: 'sass'
gem 'autoprefixer-rails', '~> 9.5.1.1'
gem 'uglifier', '~> 4.1.20'

end

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

group :development, :test do
gem "byebug"
gem 'faker'
gem 'pry-rails'
gem 'byebug', '~> 11.0.1', platforms: [:mri, :mingw, :x64_mingw]
gem 'faker', '~> 1.9.3'
gem 'pry-rails', '~> 0.3.9'
end

group :development do
gem "jshintrb"
gem "therubyracer"
gem 'jshintrb', '~> 0.3.0'
gem 'therubyracer', '~> 0.12.3'
gem 'mini_racer', platforms: :ruby
gem 'listen', '~> 3.1.5'
gem 'web-console', '~> 2.0'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

group :sqlite do
# if you decide to use sqlite3 as the database
gem "sqlite3"
gem 'sqlite3'
end

group :passenger do
# passenger server
gem "passenger"
gem 'passenger'
end

gem 'httparty'
Loading