Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…icrm

# Conflicts:
#	Gemfile.lock
#	app/commands/decidim/civicrm/admin/update_event_meeting.rb
#	app/jobs/decidim/civicrm/auto_verification_job.rb
#	decidim-civicrm.gemspec
#	lib/decidim/civicrm/admin_engine.rb
#	lib/decidim/civicrm/version.rb
#	lib/generators/decidim/civicrm/templates/development_civicrm_config.rb
#	spec/controllers/admin/meetings_controller_spec.rb
#	spec/lib/overrides_spec.rb
  • Loading branch information
microstudi committed Aug 15, 2023
2 parents 1df6684 + fcfe186 commit e50a841
Show file tree
Hide file tree
Showing 47 changed files with 492 additions and 2,148 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2

jobs:
lint-report:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2

jobs:
test-report:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04

services:
postgres:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ node_modules/
npm_debug.log

.ruby-version
.rubocop-*
4 changes: 1 addition & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
inherit_from: https://raw.githubusercontent.com/decidim/decidim/release/0.27-stable/.rubocop.yml
87 changes: 0 additions & 87 deletions .rubocop_rails.yml

This file was deleted.

Loading

0 comments on commit e50a841

Please sign in to comment.