consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4209 from consul/ruby2.6

Browse Source 
Upgrade Ruby to 2.6.6
This commit is contained in:
Javi Martín
2020-11-02 11:39:23 +01:00
committed by GitHub
parent 2195bacfb3 8e64d6c1a7
commit b170949fc1
7 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ruby-version
View File

@@ -1 +1 @@
2.5.8 2.6.6

2
README.md
View File

@@ -39,7 +39,7 @@ You can access the main website of the project at [http://consulproject.org](htt
**NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org) **NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org)
Prerequisites: install git, Ruby 2.5.8, `bundler` gem, Node.js and PostgreSQL (>=9.4). Prerequisites: install git, Ruby 2.6.6, Node.js and PostgreSQL (>=9.4).
```bash ```bash
git clone https://github.com/consul/consul.git git clone https://github.com/consul/consul.git

2
README_ES.md
View File

@@ -36,7 +36,7 @@ Puedes acceder a la página principal del proyecto en [http://consulproject.org]
**NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consulproject.org) **NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consulproject.org)
Prerequisitos: tener instalado git, Ruby 2.5.8, la gema `bundler`, Node.js y PostgreSQL (9.4 o superior). Prerequisitos: tener instalado git, Ruby 2.6.6, Node.js y PostgreSQL (9.4 o superior).
```bash ```bash
git clone https://github.com/consul/consul.git git clone https://github.com/consul/consul.git

2
app/controllers/concerns/commentable_actions.rb
View File

@@ -9,7 +9,7 @@ module CommentableActions
@resources = @current_order == "recommendations" && current_user.present? ? @resources.recommendations(current_user) : @resources.for_render @resources = @current_order == "recommendations" && current_user.present? ? @resources.recommendations(current_user) : @resources.for_render
@resources = @resources.search(@search_terms) if @search_terms.present? @resources = @resources.search(@search_terms) if @search_terms.present?
@resources = @advanced_search_terms.present? ? @resources.filter(@advanced_search_terms) : @resources @resources = @advanced_search_terms.present? ? @resources.filter_by(@advanced_search_terms) : @resources
@resources = @resources.page(params[:page]).send("sort_by_#{@current_order}") @resources = @resources.page(params[:page]).send("sort_by_#{@current_order}")

2
app/models/budget/investment.rb
View File

@@ -357,7 +357,7 @@ class Budget
investments = investments.send(current_filter) if current_filter.present? investments = investments.send(current_filter) if current_filter.present?
investments = investments.by_heading(params[:heading_id]) if params[:heading_id].present? investments = investments.by_heading(params[:heading_id]) if params[:heading_id].present?
investments = investments.search(params[:search]) if params[:search].present? investments = investments.search(params[:search]) if params[:search].present?
investments = investments.filter(params[:advanced_search]) if params[:advanced_search].present? investments = investments.filter_by(params[:advanced_search]) if params[:advanced_search].present?
investments investments
end end

2
app/models/concerns/filterable.rb
View File

@@ -7,7 +7,7 @@ module Filterable
end end
class_methods do class_methods do
def filter(params) def filter_by(params)
resources = all resources = all
params.each do |filter, value| params.each do |filter, value|
if allowed_filter?(filter, value) if allowed_filter?(filter, value)

9
config/deploy.rb
View File

@@ -50,7 +50,6 @@ namespace :deploy do
after :updating, "rvm1:install:rvm" after :updating, "rvm1:install:rvm"
after :updating, "rvm1:install:ruby" after :updating, "rvm1:install:ruby"
after :updating, "install_bundler_gem"
after "deploy:migrate", "add_new_settings" after "deploy:migrate", "add_new_settings"
@@ -70,14 +69,6 @@ namespace :deploy do
end end
end end
task :install_bundler_gem do
on roles(:app) do
within release_path do
execute :rvm, fetch(:rvm1_ruby_version), "do", "gem install bundler --version 1.17.1"
end
end
end
task :refresh_sitemap do task :refresh_sitemap do
on roles(:app) do on roles(:app) do
within release_path do within release_path do