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 version 0.27 #93

Merged
merged 29 commits into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5673dd8
prevent changing document if annotations. Remove sections if not
microstudi Jun 20, 2023
e92502b
Merge remote-tracking branch 'origin/main' into fix-boxing-bugs
microstudi Jun 21, 2023
f7fe346
add webkit compatiblity css
microstudi Jun 21, 2023
252d02f
javascript reordering of boxes
microstudi Jun 21, 2023
c527fa9
add postion in db
microstudi Jun 22, 2023
755254a
fix prevent document modifications on suggestions
microstudi Jun 22, 2023
11b5be9
reorder in backend
microstudi Jun 22, 2023
c571f0b
backedn reorder & tests
microstudi Jun 22, 2023
44161e9
linting
microstudi Jun 22, 2023
af99cd0
do not restore boxes on save
microstudi Jun 22, 2023
fcdf416
update pdf
microstudi Jun 22, 2023
a16768c
test fix
microstudi Jun 22, 2023
02d4388
fix tests
microstudi Jun 23, 2023
6c9d6bd
fix pending tests
microstudi Jun 23, 2023
4baf735
remove debug
microstudi Jun 23, 2023
bedb1ea
fix
microstudi Jun 23, 2023
832e467
Merge remote-tracking branch 'origin/main' into fix-boxing-bugs
microstudi Jun 26, 2023
082b11e
update versiosn
microstudi Jul 7, 2023
21679f0
update packages
microstudi Jul 7, 2023
e5fb141
remove rectify
microstudi Jul 7, 2023
0994f31
fix babel config
microstudi Jul 7, 2023
50c442b
fix linters
microstudi Jul 7, 2023
057ee06
fix some tests
microstudi Jul 7, 2023
dcb0e9f
fix preview non-logged
microstudi Jul 7, 2023
bdfc45c
Merge branch 'fix-boxing-bugs' into upgrade-0.27
microstudi Jul 7, 2023
6da69f6
fix remove annotation
microstudi Jul 7, 2023
caa3b43
Merge branch 'fix-boxing-bugs' into upgrade-0.27
microstudi Jul 7, 2023
c84057d
fix spec tests
microstudi Jul 7, 2023
eeab172
Merge branch 'main' into upgrade-0.27
microstudi Jul 7, 2023
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
5 changes: 3 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.6
RUBY_VERSION: 3.0.5
NODE_VERSION: 16.9.1

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

env:
RUBY_VERSION: 2.7.6
RUBY_VERSION: 3.0.5
NODE_VERSION: 16.9.1

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

services:
postgres:
Expand Down Expand Up @@ -39,6 +40,10 @@ jobs:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- uses: actions/setup-node@master
with:
node-version: ${{ env.NODE_VERSION }}

- name: Setup Database
run: bundle exec rake test_app

Expand Down
11 changes: 11 additions & 0 deletions .rubocop-disabled.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Style/OpenStructUse:
Enabled: false

Gemspec/RequireMFA:
Enabled: false

Naming/MemoizedInstanceVariableName:
Enabled: false

RSpec/VerifiedDoubleReference:
Enabled: false
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
- .rubocop-disabled.yml
4 changes: 4 additions & 0 deletions .rubocop_rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Rails/Output:
- lib/**/*.rb
Exclude:
- db/seeds.rb

Rails/OutputSafety:
Enabled: false

Expand All @@ -85,3 +86,6 @@ Rails/SkipsModelValidations:
Rails/Validation:
Include:
- app/models/**/*.rb

Rails/CompactBlank:
Enabled: false
34 changes: 24 additions & 10 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ AllCops:
- "**/Gemfile"
- "**/Rakefile"
Exclude:
- "**/node_modules/**/*"
- "**/vendor/**/*"
- "development_app/**/*"
- "decidim_app-design/node_modules/**/*"
- "spec/decidim_dummy_app/**/*"
- "node_modules/**/*"
- "db/migrate/*"
- "db/schema.rb"
- "decidim-initiatives/lib/gem_overrides/origami/date.rb"
# Default formatter will be used if no -f/--format option is given.
DefaultFormatter: progress
# Cop names are not displayed in offense messages by default. Change behavior
Expand Down Expand Up @@ -69,12 +70,12 @@ AllCops:
# If a value is specified for TargetRubyVersion then it is used.
# Else if .ruby-version exists and it contains an MRI version it is used.
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0

RSpec:
Patterns:
- "(?:^|/)spec/"
- "(?:^|/)test/"
# RSpec:
# Patterns:
# - "(?:^|/)spec/"
# - "(?:^|/)test/"

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
Expand Down Expand Up @@ -178,6 +179,15 @@ Layout/ParameterAlignment:
# But it can be overridden by setting this parameter
IndentationWidth: ~

Style/ArrayCoercion:
Description: >-
Use Array() instead of explicit Array check or [*var], when dealing
with a variable you want to treat as an Array, but you're not certain it's an array.
StyleGuide: '#array-coercion'
Safe: false
Enabled: false
VersionAdded: '0.88'

Style/AndOr:
# Whether `and` and `or` are banned only in conditionals (conditionals)
# or completely (always).
Expand Down Expand Up @@ -453,6 +463,7 @@ Naming/FileName:
- "**/Gemfile"
- "**/Rakefile"
- "**/*.gemspec"
- "decidim-dev/lib/decidim-dev.rb"
# When true, requires that each source file should define a class or module
# with a name which matches the file name (converted to ... case).
# It further expects it to be nested inside modules which match the names
Expand Down Expand Up @@ -1220,7 +1231,7 @@ RSpec/ContextWording:
RSpec/DescribeClass:
Exclude:
- spec/gemfiles_spec.rb
- spec/js_bundles_spec.rb
- spec/webpacker_spec.rb
- spec/i18n_spec.rb
- "**/*/spec/**/*_badge_spec.rb"
- decidim-core/spec/lib/global_engines_spec.rb
Expand Down Expand Up @@ -1250,6 +1261,8 @@ RSpec/MultipleExpectations:

RSpec/MultipleMemoizedHelpers:
Max: 35
Exclude:
- decidim-assemblies/spec/forms/assembly_form_spec.rb

RSpec/NestedGroups:
Max: 7
Expand All @@ -1258,10 +1271,11 @@ RSpec/NamedSubject:
Enabled: false

RSpec/RepeatedExampleGroupDescription:
Enabled: false
Enabled: true

RSpec/RepeatedExampleGroupBody:
Enabled: false
Enabled: true

RSpec/VerifiedDoubles:
Enabled: false

Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.0.5
4 changes: 2 additions & 2 deletions .simplecov
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# frozen_string_literal: true

SimpleCov.start do
root ENV["ENGINE_ROOT"]
root ENV.fetch("ENGINE_ROOT", nil)

add_filter "lib/decidim/participatory_documents/version.rb"
add_filter "lib/decidim/participatory_documents/component.rb"
add_filter "/spec"
end

SimpleCov.command_name ENV["COMMAND_NAME"] || File.basename(Dir.pwd)
SimpleCov.command_name ENV.fetch("COMMAND_NAME", nil) || File.basename(Dir.pwd)

SimpleCov.merge_timeout 1800
Loading