mirror of
https://github.com/ENSL/ensl.org.git
synced 2024-12-27 04:51:14 +00:00
Update to rails 6
This commit is contained in:
parent
c0a7c88b8d
commit
2d73f617bc
5 changed files with 64 additions and 48 deletions
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:2.4.9
|
FROM ruby:2.5.7
|
||||||
|
|
||||||
ENV RAILS_ENV development
|
ENV RAILS_ENV development
|
||||||
|
|
||||||
|
|
4
Gemfile
4
Gemfile
|
@ -1,10 +1,10 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
ruby '2.4.9'
|
ruby '2.5.7'
|
||||||
|
|
||||||
# Rails core
|
# Rails core
|
||||||
gem 'rails', '~> 5.2.4.1'
|
gem 'rails', '~> 6.0.2.1'
|
||||||
gem 'rake', '< 11.0'
|
gem 'rake', '< 11.0'
|
||||||
|
|
||||||
# Dotenv
|
# Dotenv
|
||||||
|
|
102
Gemfile.lock
102
Gemfile.lock
|
@ -9,52 +9,66 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.2.4.1)
|
actioncable (6.0.2.1)
|
||||||
actionpack (= 5.2.4.1)
|
actionpack (= 6.0.2.1)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailer (5.2.4.1)
|
actionmailbox (6.0.2.1)
|
||||||
actionpack (= 5.2.4.1)
|
actionpack (= 6.0.2.1)
|
||||||
actionview (= 5.2.4.1)
|
activejob (= 6.0.2.1)
|
||||||
activejob (= 5.2.4.1)
|
activerecord (= 6.0.2.1)
|
||||||
|
activestorage (= 6.0.2.1)
|
||||||
|
activesupport (= 6.0.2.1)
|
||||||
|
mail (>= 2.7.1)
|
||||||
|
actionmailer (6.0.2.1)
|
||||||
|
actionpack (= 6.0.2.1)
|
||||||
|
actionview (= 6.0.2.1)
|
||||||
|
activejob (= 6.0.2.1)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (5.2.4.1)
|
actionpack (6.0.2.1)
|
||||||
actionview (= 5.2.4.1)
|
actionview (= 6.0.2.1)
|
||||||
activesupport (= 5.2.4.1)
|
activesupport (= 6.0.2.1)
|
||||||
rack (~> 2.0, >= 2.0.8)
|
rack (~> 2.0, >= 2.0.8)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||||
actionview (5.2.4.1)
|
actiontext (6.0.2.1)
|
||||||
activesupport (= 5.2.4.1)
|
actionpack (= 6.0.2.1)
|
||||||
|
activerecord (= 6.0.2.1)
|
||||||
|
activestorage (= 6.0.2.1)
|
||||||
|
activesupport (= 6.0.2.1)
|
||||||
|
nokogiri (>= 1.8.5)
|
||||||
|
actionview (6.0.2.1)
|
||||||
|
activesupport (= 6.0.2.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||||
active_link_to (1.0.5)
|
active_link_to (1.0.5)
|
||||||
actionpack
|
actionpack
|
||||||
addressable
|
addressable
|
||||||
active_record_union (1.3.0)
|
active_record_union (1.3.0)
|
||||||
activerecord (>= 4.0)
|
activerecord (>= 4.0)
|
||||||
activejob (5.2.4.1)
|
activejob (6.0.2.1)
|
||||||
activesupport (= 5.2.4.1)
|
activesupport (= 6.0.2.1)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.2.4.1)
|
activemodel (6.0.2.1)
|
||||||
activesupport (= 5.2.4.1)
|
activesupport (= 6.0.2.1)
|
||||||
activerecord (5.2.4.1)
|
activerecord (6.0.2.1)
|
||||||
activemodel (= 5.2.4.1)
|
activemodel (= 6.0.2.1)
|
||||||
activesupport (= 5.2.4.1)
|
activesupport (= 6.0.2.1)
|
||||||
arel (>= 9.0)
|
activestorage (6.0.2.1)
|
||||||
activestorage (5.2.4.1)
|
actionpack (= 6.0.2.1)
|
||||||
actionpack (= 5.2.4.1)
|
activejob (= 6.0.2.1)
|
||||||
activerecord (= 5.2.4.1)
|
activerecord (= 6.0.2.1)
|
||||||
marcel (~> 0.3.1)
|
marcel (~> 0.3.1)
|
||||||
activesupport (5.2.4.1)
|
activesupport (6.0.2.1)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
|
zeitwerk (~> 2.2)
|
||||||
addressable (2.7.0)
|
addressable (2.7.0)
|
||||||
public_suffix (>= 2.0.2, < 5.0)
|
public_suffix (>= 2.0.2, < 5.0)
|
||||||
annotate (3.1.0)
|
annotate (3.1.0)
|
||||||
|
@ -62,7 +76,6 @@ GEM
|
||||||
rake (>= 10.4, < 14.0)
|
rake (>= 10.4, < 14.0)
|
||||||
archive-zip (0.12.0)
|
archive-zip (0.12.0)
|
||||||
io-like (~> 0.3.0)
|
io-like (~> 0.3.0)
|
||||||
arel (9.0.0)
|
|
||||||
ast (2.4.0)
|
ast (2.4.0)
|
||||||
bbcoder (1.1.1)
|
bbcoder (1.1.1)
|
||||||
better_errors (2.6.0)
|
better_errors (2.6.0)
|
||||||
|
@ -245,18 +258,20 @@ GEM
|
||||||
rack (2.2.2)
|
rack (2.2.2)
|
||||||
rack-test (1.1.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rails (5.2.4.1)
|
rails (6.0.2.1)
|
||||||
actioncable (= 5.2.4.1)
|
actioncable (= 6.0.2.1)
|
||||||
actionmailer (= 5.2.4.1)
|
actionmailbox (= 6.0.2.1)
|
||||||
actionpack (= 5.2.4.1)
|
actionmailer (= 6.0.2.1)
|
||||||
actionview (= 5.2.4.1)
|
actionpack (= 6.0.2.1)
|
||||||
activejob (= 5.2.4.1)
|
actiontext (= 6.0.2.1)
|
||||||
activemodel (= 5.2.4.1)
|
actionview (= 6.0.2.1)
|
||||||
activerecord (= 5.2.4.1)
|
activejob (= 6.0.2.1)
|
||||||
activestorage (= 5.2.4.1)
|
activemodel (= 6.0.2.1)
|
||||||
activesupport (= 5.2.4.1)
|
activerecord (= 6.0.2.1)
|
||||||
|
activestorage (= 6.0.2.1)
|
||||||
|
activesupport (= 6.0.2.1)
|
||||||
bundler (>= 1.3.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 5.2.4.1)
|
railties (= 6.0.2.1)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-controller-testing (1.0.4)
|
rails-controller-testing (1.0.4)
|
||||||
actionpack (>= 5.0.1.x)
|
actionpack (>= 5.0.1.x)
|
||||||
|
@ -269,12 +284,12 @@ GEM
|
||||||
loofah (~> 2.3)
|
loofah (~> 2.3)
|
||||||
rails_autolink (1.1.6)
|
rails_autolink (1.1.6)
|
||||||
rails (> 3.1)
|
rails (> 3.1)
|
||||||
railties (5.2.4.1)
|
railties (6.0.2.1)
|
||||||
actionpack (= 5.2.4.1)
|
actionpack (= 6.0.2.1)
|
||||||
activesupport (= 5.2.4.1)
|
activesupport (= 6.0.2.1)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.19.0, < 2.0)
|
thor (>= 0.20.3, < 2.0)
|
||||||
rainbow (3.0.0)
|
rainbow (3.0.0)
|
||||||
rake (10.5.0)
|
rake (10.5.0)
|
||||||
rb-fsevent (0.10.3)
|
rb-fsevent (0.10.3)
|
||||||
|
@ -393,6 +408,7 @@ GEM
|
||||||
will_paginate (3.3.0)
|
will_paginate (3.3.0)
|
||||||
xpath (3.2.0)
|
xpath (3.2.0)
|
||||||
nokogiri (~> 1.8)
|
nokogiri (~> 1.8)
|
||||||
|
zeitwerk (2.3.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
@ -432,7 +448,7 @@ DEPENDENCIES
|
||||||
pry-byebug (~> 1.3.2)
|
pry-byebug (~> 1.3.2)
|
||||||
public_suffix
|
public_suffix
|
||||||
puma
|
puma
|
||||||
rails (~> 5.2.4.1)
|
rails (~> 6.0.2.1)
|
||||||
rails-controller-testing
|
rails-controller-testing
|
||||||
rails_autolink
|
rails_autolink
|
||||||
rake (< 11.0)
|
rake (< 11.0)
|
||||||
|
@ -457,7 +473,7 @@ DEPENDENCIES
|
||||||
will_paginate
|
will_paginate
|
||||||
|
|
||||||
RUBY VERSION
|
RUBY VERSION
|
||||||
ruby 2.4.9p362
|
ruby 2.5.7p206
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.1.4
|
2.1.4
|
||||||
|
|
|
@ -82,6 +82,6 @@ class ArticlesController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def article_params
|
def article_params
|
||||||
params.require(:article).permit(:tite, :status, :category_id, :text, :user_id)
|
params.require(:article).permit(:title, :status, :category_id, :text, :text_coding, :user_id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,7 +4,7 @@ services:
|
||||||
web:
|
web:
|
||||||
# Debug
|
# Debug
|
||||||
stdin_open: true
|
stdin_open: true
|
||||||
# command: /bin/bash
|
command: /bin/bash
|
||||||
tty: true
|
tty: true
|
||||||
build:
|
build:
|
||||||
context: ./
|
context: ./
|
||||||
|
|
Loading…
Reference in a new issue