Skip to content

Commit 2d45935

Browse files
committed
Merge branch 'master' into nb/mongoid-7-integration
2 parents dd48cee + 9eb1b01 commit 2d45935

53 files changed

Lines changed: 608 additions & 646 deletions

Some content is hidden

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

.github/workflows/codecheck.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Codecheck
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
jobs:
10+
codecheck:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: ruby/setup-ruby@v1
15+
with:
16+
ruby-version: 2.7
17+
bundler-cache: true
18+
- run: bundle exec rubocop

.github/workflows/tests.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Tests
2+
on:
3+
push:
4+
branches:
5+
- master
6+
pull_request:
7+
branches:
8+
- master
9+
jobs:
10+
test:
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
os: [ubuntu-latest]
15+
ruby: [2.5, 2.6, 2.7]
16+
runs-on: ${{ matrix.os }}
17+
18+
services:
19+
mongodb:
20+
image: mongo
21+
ports:
22+
- 27017:27017
23+
24+
steps:
25+
- uses: actions/checkout@v2
26+
- uses: ruby/setup-ruby@v1
27+
with:
28+
ruby-version: ${{ matrix.ruby }}
29+
bundler-cache: true
30+
- run: bundle exec rake

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
*.rbc
33
.config
44
.yardoc
5-
/Gemfile.lock
65
InstalledFiles
76
_yardoc
87
coverage
@@ -22,3 +21,4 @@ spec/reports
2221
/test_app/.sass-cache
2322
/test_app/config/mongoid.yml
2423
/spec/rails
24+
.ruby-version

.rubocop.yml

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
AllCops:
2+
DisabledByDefault: true
3+
TargetRubyVersion: 2.4
4+
5+
DisplayCopNames: true
6+
7+
StyleGuideCopsOnly: false
8+
9+
Layout/EndAlignment:
10+
Enabled: true
11+
12+
Lint/ParenthesesAsGroupedExpression:
13+
Enabled: true
14+
15+
Layout/AccessModifierIndentation:
16+
Enabled: true
17+
18+
Layout/CaseIndentation:
19+
Enabled: true
20+
21+
Layout/CommentIndentation:
22+
Enabled: true
23+
24+
Layout/ElseAlignment:
25+
Enabled: true
26+
27+
Layout/EmptyLines:
28+
Enabled: true
29+
30+
Layout/EmptyLinesAroundBlockBody:
31+
Enabled: true
32+
33+
Layout/EndOfLine:
34+
Enabled: true
35+
36+
Layout/ExtraSpacing:
37+
Enabled: true
38+
39+
Style/Dir:
40+
Enabled: true
41+
42+
Style/Encoding:
43+
Enabled: true
44+
45+
Style/ExpandPathArguments:
46+
Enabled: true
47+
48+
Style/FrozenStringLiteralComment:
49+
Enabled: true
50+
EnforcedStyle: never
51+
52+
Style/HashSyntax:
53+
Enabled: true
54+
55+
Style/ParallelAssignment:
56+
Enabled: true
57+
58+
Layout/IndentationConsistency:
59+
Enabled: true
60+
61+
Layout/IndentationWidth:
62+
Enabled: true
63+
64+
Naming/PredicateName:
65+
Enabled: true
66+
67+
ForbiddenPrefixes:
68+
- is_
69+
- have_
70+
71+
AllowedMethods:
72+
- has_many
73+
- has_many_actions
74+
- is_association?
75+
76+
Style/TrailingCommaInArguments:
77+
Enabled: true
78+
79+
Layout/TrailingEmptyLines:
80+
Enabled: true
81+
82+
Layout/TrailingWhitespace:
83+
Enabled: true
84+
85+
Layout/SpaceAfterComma:
86+
Enabled: true
87+
88+
Layout/SpaceAroundEqualsInParameterDefault:
89+
Enabled: true
90+
91+
Layout/SpaceAroundOperators:
92+
Enabled: true
93+
94+
Layout/SpaceBeforeBlockBraces:
95+
Enabled: true
96+
97+
Layout/SpaceInsideBlockBraces:
98+
Enabled: true
99+
100+
Layout/SpaceInsideHashLiteralBraces:
101+
Enabled: true
102+
103+
Layout/SpaceInsideParens:
104+
Enabled: true

.travis.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

Gemfile

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

3-
# Declare your gem's dependencies in activeadmin-mongoid.gemspec.
4-
# Bundler will treat runtime dependencies like base dependencies, and
5-
# development dependencies will be added by default to the :development group.
63
gemspec
74

8-
gem 'ransack', github: 'activerecord-hackery/ransack'
9-
gem 'ransack-mongoid', github: 'activerecord-hackery/ransack-mongoid'
5+
gem 'ransack-mongoid', git: 'https://github.com/activerecord-hackery/ransack-mongoid'
106

11-
# Test app stuff
12-
13-
gem 'rails', '~> 5.1'
14-
gem 'kaminari', '~> 1.0'
15-
gem 'kaminari-mongoid'
7+
gem 'rails', '>= 5.2', '< 6.1'
168

179
gem 'devise'
1810

19-
# Gems used only for assets and not required
20-
# in production environments by default.
21-
group :assets do
22-
gem 'sass-rails', '>= 5.0.6'
23-
gem 'coffee-rails', '~> 4.0'
24-
25-
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
26-
# gem 'therubyracer', :platforms => :ruby
27-
gem 'uglifier', '>= 1.0.3'
28-
end
11+
gem 'pry-rails'
2912

3013
gem 'jquery-rails'
3114
gem 'jquery-ui-rails'
3215
gem 'jslint'
3316

3417
group :test do
35-
gem 'pry-rails'
3618
gem 'capybara'
3719
gem 'poltergeist'
3820
gem 'launchy'
3921
gem 'simplecov', require: false
4022
end
23+
24+
group :lint do
25+
gem 'rubocop', '0.80.0'
26+
end

0 commit comments

Comments
 (0)