Skip to content

Commit 97f0271

Browse files
marketsmarkets
authored
Merge pull request #800 from coopdevs/develop
Release v5.4.0
2 parents 7fd7dfc + ca76571 commit 97f0271

File tree

137 files changed

+1700
-1188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1700
-1188
lines changed

‎.github/workflows/ci.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches: [develop, master]
6+
pull_request:
7+
branches: [develop, master]
48

59
jobs:
610
test:

‎.github/workflows/docker_build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Docker Build
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches: [develop, master]
6+
pull_request:
7+
branches: [develop, master]
48

59
jobs:
610
test:

‎.rubocop.yml

Lines changed: 11 additions & 230 deletions
Original file line numberDiff line numberDiff line change
@@ -1,244 +1,25 @@
1-
require: rubocop-rails
1+
# Omakase Ruby styling for Rails
2+
inherit_gem:
3+
rubocop-rails-omakase: rubocop.yml
24

5+
# Your own specialized rules go here
36
AllCops:
47
Exclude:
5-
- db/schema.rb
8+
- "db/**/*"
9+
- "config/**/*"
610

7-
Naming/AccessorMethodName:
11+
Layout/SpaceInsideArrayLiteralBrackets:
812
Enabled: false
9-
10-
Rails/HttpPositionalArguments:
11-
Enabled: true
12-
13-
Style/Alias:
14-
Enabled: false
15-
16-
Style/ArrayJoin:
17-
Enabled: false
18-
19-
Style/AsciiComments:
20-
Enabled: false
21-
22-
Naming/AsciiIdentifiers:
23-
Enabled: false
24-
25-
Style/Attr:
26-
Enabled: false
27-
28-
Metrics/BlockNesting:
29-
Enabled: false
30-
31-
Style/CaseEquality:
32-
Enabled: false
33-
34-
Style/CharacterLiteral:
35-
Enabled: false
36-
37-
Style/ClassAndModuleChildren:
13+
Layout/SpaceInsidePercentLiteralDelimiters:
3814
Enabled: false
39-
40-
Metrics/ClassLength:
41-
Enabled: false
42-
43-
Style/ClassVars:
44-
Enabled: false
45-
46-
Style/CollectionMethods:
47-
PreferredMethods:
48-
find: detect
49-
reduce: inject
50-
collect: map
51-
find_all: select
52-
53-
Style/ColonMethodCall:
54-
Enabled: false
55-
56-
Style/CommentAnnotation:
57-
Enabled: false
58-
59-
Metrics/CyclomaticComplexity:
15+
Layout/CaseIndentation:
6016
Enabled: false
61-
62-
Style/Documentation:
17+
Layout/EndAlignment:
6318
Enabled: false
64-
65-
Layout/DotPosition:
66-
EnforcedStyle: trailing
67-
68-
Layout/ConditionPosition:
69-
Enabled: false
70-
71-
Style/DoubleNegation:
72-
Enabled: false
73-
74-
Style/EachWithObject:
75-
Enabled: false
76-
77-
Style/EmptyLiteral:
78-
Enabled: false
79-
80-
Style/Encoding:
81-
Enabled: false
82-
83-
Style/EvenOdd:
84-
Enabled: false
85-
86-
Naming/FileName:
87-
Enabled: false
88-
89-
Style/FormatString:
90-
Enabled: false
91-
92-
Style/GlobalVars:
93-
Enabled: false
94-
95-
Style/GuardClause:
96-
Enabled: false
97-
98-
Style/IfUnlessModifier:
99-
Enabled: false
100-
101-
Style/IfWithSemicolon:
102-
Enabled: false
103-
104-
Style/InlineComment:
105-
Enabled: false
106-
107-
Style/Lambda:
108-
Enabled: false
109-
110-
Style/LambdaCall:
111-
Enabled: false
112-
113-
Style/LineEndConcatenation:
114-
Enabled: false
115-
116-
Layout/LineLength:
117-
Max: 100
118-
119-
Metrics/MethodLength:
120-
Enabled: false
121-
122-
Style/ModuleFunction:
123-
Enabled: false
124-
125-
Style/NegatedIf:
126-
Enabled: false
127-
128-
Style/NegatedWhile:
129-
Enabled: false
130-
131-
Style/Next:
132-
Enabled: false
133-
134-
Style/NilComparison:
135-
Enabled: false
136-
137-
Style/Not:
138-
Enabled: false
139-
140-
Style/NumericLiterals:
141-
Enabled: false
142-
143-
Style/OneLineConditional:
144-
Enabled: false
145-
146-
Metrics/ParameterLists:
19+
Layout/ElseAlignment:
14720
Enabled: false
14821

14922
Style/PercentLiteralDelimiters:
15023
Enabled: false
151-
152-
Style/PerlBackrefs:
153-
Enabled: false
154-
155-
Naming/PredicateName:
156-
ForbiddenPrefixes:
157-
- is_
158-
159-
Style/Proc:
160-
Enabled: false
161-
162-
Style/RaiseArgs:
163-
Enabled: false
164-
165-
Style/RegexpLiteral:
166-
Enabled: false
167-
168-
Style/SelfAssignment:
169-
Enabled: false
170-
171-
Style/SingleLineBlockParams:
172-
Enabled: false
173-
174-
Style/SingleLineMethods:
175-
Enabled: false
176-
177-
Style/SignalException:
178-
Enabled: false
179-
180-
Style/SpecialGlobalVars:
181-
Enabled: false
182-
18324
Style/StringLiterals:
184-
EnforcedStyle: double_quotes
185-
186-
Style/VariableInterpolation:
187-
Enabled: false
188-
189-
Style/TrailingCommaInArrayLiteral:
190-
Enabled: false
191-
192-
Style/TrailingCommaInHashLiteral:
193-
Enabled: false
194-
195-
Style/TrailingCommaInArguments:
196-
Enabled: false
197-
198-
Style/TrivialAccessors:
199-
Enabled: false
200-
201-
Style/WhenThen:
202-
Enabled: false
203-
204-
Style/WhileUntilModifier:
205-
Enabled: false
206-
207-
Lint/AmbiguousOperator:
208-
Enabled: false
209-
210-
Lint/AmbiguousRegexpLiteral:
211-
Enabled: false
212-
213-
Lint/AssignmentInCondition:
214-
Enabled: false
215-
216-
Lint/DeprecatedClassMethods:
217-
Enabled: false
218-
219-
Lint/ElseLayout:
220-
Enabled: false
221-
222-
Lint/SuppressedException:
223-
Enabled: false
224-
225-
Lint/LiteralInInterpolation:
226-
Enabled: false
227-
228-
Lint/Loop:
229-
Enabled: false
230-
231-
Lint/ParenthesesAsGroupedExpression:
232-
Enabled: false
233-
234-
Lint/RequireParentheses:
235-
Enabled: false
236-
237-
Lint/UnderscorePrefixedVariableName:
238-
Enabled: false
239-
240-
Lint/Void:
241-
Enabled: false
242-
243-
Lint/FlipFlop:
24425
Enabled: false

‎Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ RUN RAILS_ENV=production \
5454
SECRET_KEY_BASE=dummy \
5555
RAILS_MASTER_KEY=dummy \
5656
DB_ADAPTER=nulldb \
57+
ASSETS_PRECOMPILE=true \
58+
STORAGE_PROVIDER=local \
5759
bundle exec rails assets:precompile
5860

5961
RUN mv config/credentials.yml.enc.bak config/credentials.yml.enc 2>/dev/null || true
@@ -97,4 +99,4 @@ HEALTHCHECK --interval=1m --timeout=5s --start-period=10s \
9799

98100

99101
ENTRYPOINT ["/app/entrypoint.sh"]
100-
CMD ["/usr/bin/supervisord"]
102+
CMD ["/usr/bin/supervisord"]

‎Gemfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '~> 7.0.8'
3+
gem 'rails', '~> 7.2'
44
gem 'rails-i18n', '~> 7.0'
5-
gem 'puma', '~> 6.4'
5+
gem 'puma', '~> 6.6'
66
gem 'rdiscount', '~> 2.2.7'
77
gem 'rubyzip', '~> 2.3.0'
8-
gem 'activeadmin', '~> 2.14'
8+
gem 'activeadmin', '~> 3.2'
99
gem 'bootsnap', '~> 1.12', require: false
1010
gem 'has_scope', '~> 0.7.2'
1111
gem 'pundit', '~> 2.1.0'
@@ -28,26 +28,25 @@ gem 'active_storage_validations', '~> 1.1.3'
2828

2929
# Assets
3030
gem 'jquery-rails', '~> 4.4.0'
31-
gem 'bootstrap-sass', '~> 3.4'
31+
gem 'bootstrap', '~> 5.3.3'
3232
gem 'sassc-rails', '~> 2.1.2'
3333
gem 'select2-rails', '~> 4.0.13'
3434

3535
group :production do
3636
# we are using an ExecJS runtime only on the precompilation phase
37-
gem "uglifier", "~> 4.2.0", require: false
37+
gem "terser", "~> 1.2", require: false
3838
end
3939

4040
group :development do
4141
gem 'localeapp', '~> 3.3', require: false
4242
gem 'letter_opener', '~> 1.7.0'
43-
gem 'web-console', '~> 4.1.0'
43+
gem 'web-console', '~> 4.2'
4444
end
4545

4646
group :development, :test do
4747
gem 'byebug', '~> 11.0'
48-
gem 'rubocop', '~> 1.6', require: false
49-
gem 'rubocop-rails', '~> 2.9', require: false
50-
gem 'dotenv-rails', '~> 2.7.1'
48+
gem 'rubocop-rails-omakase', require: false
49+
gem 'dotenv-rails', '~> 3.1.7'
5150
end
5251

5352
group :test do
@@ -56,7 +55,7 @@ group :test do
5655
gem 'database_cleaner', '~> 2.0'
5756
gem 'shoulda-matchers', '~> 4.4'
5857
gem 'fabrication', '~> 2.20'
59-
gem 'faker', '~> 2.15'
58+
gem 'faker', '~> 3.5'
6059
gem 'capybara', '~> 3.29'
6160
gem 'selenium-webdriver', '~> 4.16'
6261
gem 'simplecov', '~> 0.22', require: false

0 commit comments

Comments
 (0)