Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
ac3b8b8
Support Rails 5+ attributes api for virtual attributes
excid3 Aug 26, 2018
8edbe6f
Merge remote-tracking branch 'upstream/master'
excid3 Mar 6, 2019
be5063a
Support Rails 5+ attributes api for virtual attributes
excid3 Aug 26, 2018
07ae1b7
Merge branch 'master' of github.com:thoughtbot/administrate
excid3 May 28, 2019
1a10bcd
Eager load rails app for routes generator and add virtual attribute s…
excid3 May 28, 2019
29802aa
Fix punditize module loading for rails 6
excid3 May 28, 2019
20c258b
Merge branch 'master' of github.com:thoughtbot/administrate into jump…
excid3 Jun 10, 2019
4f1010c
Add rich text field support
excid3 Jun 11, 2019
6a1a0d7
Add route when generating dashboard
excid3 Jun 11, 2019
6c9a083
Fix route injection
excid3 Jun 11, 2019
9a63a74
Add route when generating new dashboards
excid3 Jun 11, 2019
66c6d33
Fix admin namespace reference
excid3 Jun 17, 2019
fdb6f94
Fix admin namespace option
excid3 Jun 24, 2019
c879f8d
Merge branch 'jumpstart' of github.com:excid3/administrate into jumps…
excid3 Jun 24, 2019
c664b5d
Merge branch 'master' of github.com:thoughtbot/administrate into jump…
excid3 Jun 24, 2019
81bc7f6
Merge branch 'master' of github.com:thoughtbot/administrate
excid3 Oct 1, 2019
73b3f08
Merge upstream
excid3 Oct 1, 2019
8994c19
Merge
excid3 Oct 1, 2019
09c8306
Fix actiontext names
excid3 Oct 1, 2019
3ac00be
Merge remote-tracking branch 'upstream/master'
excid3 Nov 9, 2019
3914d6a
Merge remote-tracking branch 'origin/master'
excid3 Nov 9, 2019
aa1df6d
Merge branch 'master' into jumpstart
excid3 Nov 9, 2019
3d71972
Merge remote-tracking branch 'upstream/master'
excid3 Feb 8, 2020
6e2312a
Merge branch 'master' of github.com:thoughtbot/administrate
excid3 Mar 18, 2020
66fccf1
Merge branch 'master' into jumpstart
excid3 Mar 18, 2020
2378418
Merge branch 'master' of github.com:thoughtbot/administrate into jump…
excid3 Jul 7, 2020
239ec5b
Merge branch 'master' of github.com:thoughtbot/administrate into jump…
excid3 Jul 10, 2020
4267d94
Merge branch 'master' of github.com:thoughtbot/administrate into master
excid3 Aug 20, 2020
bb4b6b8
Merge master
excid3 Aug 20, 2020
c879e75
Merge upstream
excid3 Oct 12, 2020
f550875
Merge branch 'master' of git://github.com/thoughtbot/administrate int…
excid3 Nov 21, 2020
58ef1d8
Fix find module missing in generator helpers
excid3 Nov 21, 2020
42d29bb
Merge branch 'master' of git://github.com/thoughtbot/administrate int…
excid3 Dec 10, 2020
ed05fa8
Merge upstream
excid3 Mar 19, 2021
e0c07a8
fetch upstream
williamkennedy May 6, 2021
d1ba12a
Merge pull request #4 from williamkennedy/jumpstart
excid3 May 6, 2021
4ce2fd4
Merge upstream
excid3 May 17, 2021
7c598e1
Merge
excid3 May 17, 2021
d3452a1
Bump shoulda-matchers from 4.5.1 to 5.0.0
dependabot[bot] Jul 12, 2021
77ba54d
Bump front_matter_parser from 1.0.0 to 1.0.1
dependabot[bot] Jul 20, 2021
4c2665b
Bump appraisal from 2.4.0 to 2.4.1
dependabot[bot] Jul 28, 2021
d57038a
Bump webmock from 3.13.0 to 3.14.0
dependabot[bot] Aug 5, 2021
d390b94
Bump pundit from 2.1.0 to 2.1.1
dependabot[bot] Aug 13, 2021
5285f69
Merge pull request #12 from excid3/dependabot/bundler/shoulda-matcher…
excid3 Oct 4, 2021
143edfe
Merge pull request #13 from excid3/dependabot/bundler/front_matter_pa…
excid3 Oct 4, 2021
4f8db57
Merge pull request #15 from excid3/dependabot/bundler/appraisal-2.4.1
excid3 Oct 4, 2021
3df9bea
Bump globalid from 0.4.2 to 0.5.2
dependabot[bot] Oct 4, 2021
7a55f94
Merge pull request #16 from excid3/dependabot/bundler/globalid-0.5.2
excid3 Oct 4, 2021
94bf724
Bump rspec-rails from 5.0.1 to 5.0.2
dependabot[bot] Oct 4, 2021
7649bf6
Merge pull request #17 from excid3/dependabot/bundler/webmock-3.14.0
excid3 Oct 4, 2021
7847b7e
Merge pull request #19 from excid3/dependabot/bundler/rspec-rails-5.0.2
excid3 Oct 4, 2021
2da81e9
Merge pull request #18 from excid3/dependabot/bundler/pundit-2.1.1
excid3 Oct 4, 2021
784771e
Bump actionpack from 6.1.3.2 to 6.1.4.1
dependabot[bot] Oct 4, 2021
9af36ad
Bump bundler-audit from 0.8.0 to 0.9.0.1
dependabot[bot] Oct 4, 2021
62dde3c
Bump activerecord from 6.1.3.2 to 6.1.4.1
dependabot[bot] Oct 4, 2021
122272c
Merge pull request #20 from excid3/dependabot/bundler/actionpack-6.1.4.1
excid3 Oct 4, 2021
5d7f7df
Merge pull request #22 from excid3/dependabot/bundler/activerecord-6.…
excid3 Oct 4, 2021
f76e986
Bump faker from 2.18.0 to 2.19.0
dependabot[bot] Oct 4, 2021
cced8ce
Merge pull request #24 from excid3/dependabot/bundler/bundler-audit-0…
excid3 Oct 4, 2021
b0f2ae2
Merge pull request #25 from excid3/dependabot/bundler/faker-2.19.0
excid3 Oct 4, 2021
0f52d8d
Merge upstream
excid3 May 25, 2022
6c72c62
Update dependencies
excid3 May 25, 2022
238d6d5
Merge branch 'thoughtbot:main' into jumpstart
excid3 Jun 8, 2022
c45f578
Merge upstream
excid3 Jul 28, 2022
27b16d4
Merge branch 'thoughtbot-main' into jumpstart
excid3 Jul 28, 2022
f1c631b
Merge branch 'jumpstart' of github.com:excid3/administrate into jumps…
excid3 Jul 28, 2022
b77023f
Add rich text field
excid3 Jan 17, 2023
482b455
Require rich_text field
excid3 Jan 17, 2023
961ad82
Enable running workflows from forks (#2498)
nickcharlton Jan 26, 2024
b589a14
Bump capybara from 3.39.2 to 3.40.0 (#2500)
dependabot[bot] Jan 30, 2024
fad9c40
Switch to using @thoughtbot/stylelint-config (#2492)
nickcharlton Feb 2, 2024
2a1bf79
Start bundling compiled assets in the Gem (#2397)
elias19r Feb 2, 2024
cc9b13b
Add .node-version to test against Node v20.11.0 (#2507)
nickcharlton Feb 2, 2024
3ff3b7d
Lint Ruby with standardrb (#2508)
nickcharlton Feb 5, 2024
45c0884
Release v1.0.0.beta1
nickcharlton Feb 5, 2024
ea28c1a
Bump nokogiri from 1.16.0 to 1.16.2 (#2509)
dependabot[bot] Feb 6, 2024
b0ff4df
Bump webmock from 3.19.1 to 3.20.0 (#2510)
dependabot[bot] Feb 8, 2024
07d5486
Bump dotenv-rails from 2.8.1 to 3.0.0 (#2513)
dependabot[bot] Feb 13, 2024
682471a
Bump standard from 1.33.0 to 1.34.0 (#2515)
dependabot[bot] Feb 13, 2024
bd5bb08
Fix Field::Boolean hidden checkbox regression (#2512)
jasongorst Feb 14, 2024
a742521
Fix bug where layout generator ignored namespace (#2502)
trevorrjohn Feb 14, 2024
9547d64
Implement client-side with Stimulus (#2447)
seanpdoyle Feb 14, 2024
21602c3
Replace `jquery-ujs` with `@hotwired/turbo` (#2448)
seanpdoyle Feb 14, 2024
074cb1a
Unsafe Actions: Replace `link_to` calls with `button_to` (#2516)
seanpdoyle Feb 15, 2024
9e364f5
Bump pg from 1.5.4 to 1.5.5 (#2520)
dependabot[bot] Feb 16, 2024
679ae5a
Bump dotenv-rails from 3.0.0 to 3.0.2 (#2525)
dependabot[bot] Feb 19, 2024
ba078f4
Bump webmock from 3.20.0 to 3.21.0 (#2526)
dependabot[bot] Feb 20, 2024
8d5b965
Bump selenium-webdriver from 4.17.0 to 4.18.0 (#2527)
dependabot[bot] Feb 20, 2024
fe0ab25
Use admin draw route if exists
excid3 Feb 20, 2024
290018a
Bump selenium-webdriver from 4.18.0 to 4.18.1 (#2528)
dependabot[bot] Feb 21, 2024
2c6a639
Bump webmock from 3.21.0 to 3.21.2 (#2529)
dependabot[bot] Feb 21, 2024
490dd57
Bump webmock from 3.21.2 to 3.22.0 (#2531)
dependabot[bot] Feb 22, 2024
5e3db2d
Merge pull request #153 from thoughtbot/main
excid3 Feb 23, 2024
54da132
Merge main
excid3 Feb 23, 2024
40b63f7
Merge main
excid3 Feb 23, 2024
36e020b
Fix typo
excid3 Feb 23, 2024
5db6aba
Add namespace method
excid3 Feb 23, 2024
4575d63
Use plural filename because dashboard generator doesn't use named base
excid3 Feb 23, 2024
53f4a1a
Bump actions/checkout from 3 to 4
dependabot[bot] Feb 23, 2024
967371a
Bump ammeter from 1.1.6 to 1.1.7
dependabot[bot] Feb 23, 2024
f55c4f6
Standardize
excid3 Feb 24, 2024
b7af1b3
Merge pull request #157 from excid3/dependabot/bundler/ammeter-1.1.7
excid3 Feb 24, 2024
0ee700d
Merge pull request #156 from excid3/dependabot/github_actions/actions…
excid3 Feb 24, 2024
348b30e
Bump yard from 0.9.34 to 0.9.36
dependabot[bot] Mar 1, 2024
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
7 changes: 6 additions & 1 deletion .github/workflows/bundle-audit.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
---
name: Bundler Audit
on: [push]
on:
push:
branches:
- 'main'
pull_request:
types: [opened, synchronize, reopened]

jobs:
audit:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
---
name: "CodeQL"

name: CodeQL
on:
push:
branches:
- 'main'
pull_request:
types: [opened, synchronize, reopened]
schedule:
- cron: '44 6 * * 4'

Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Lint
on:
push:
branches:
- 'main'
pull_request:
types: [opened, synchronize, reopened]

jobs:
standardrb:
runs-on: ubuntu-latest
permissions:
contents: read
checks: write
steps:
- uses: actions/checkout@v4
- name: StandardRB Linter
uses: testdouble/standard-ruby-action@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

stylelint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JS
uses: actions/setup-node@v4
with:
cache: yarn
- name: Install JS dependencies
run: yarn install
- name: Run Stylelint
run: yarn run lint:css
21 changes: 17 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
---
name: CI
on: [push]
name: Tests
on:
push:
branches:
- 'main'
pull_request:
types: [opened, synchronize, reopened]

jobs:
test:
Expand Down Expand Up @@ -28,21 +33,29 @@ jobs:
--health-timeout 5s
--health-retries 5
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Install dependencies
- name: Set up JS
uses: actions/setup-node@v4
with:
cache: yarn
- name: Install Ruby dependencies
run: bundle install
- name: Install Appraisal dependencies
run: bundle exec appraisal install
- name: Install JS dependencies
run: yarn install
- name: Setup the environment
run: cp .sample.env .env
- run: cp spec/example_app/config/database.yml.sample spec/example_app/config/database.yml
- name: Setup the database
run: bundle exec rake db:setup
- name: Build assets
run: yarn run build && yarn run build:css
- name: Run tests
run: bundle exec rspec
- name: Appraise Rails 6.0
Expand Down
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,28 @@
/.foreman
/coverage/*
/db/*.sqlite3

/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

/spec/example_app/log/*
/spec/example_app/tmp/*
!/spec/example_app/log/.keep
!/spec/example_app/tmp/.keep
/spec/example_app/public/system
/spec/example_app/public/assets

/spec/example_app/app/assets/builds/*
!/spec/example_app/app/assets/builds/.keep

/spec/example_app/node_modules
/spec/example_app/config/database.yml

/node_modules
/public

/tags
pkg
*.ipr
Expand All @@ -28,3 +39,4 @@ pkg
gemfiles/.bundle/
.yardoc
/doc
*.gem
6 changes: 1 addition & 5 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
---
ruby:
config_file: .rubocop.yml
scss:
enabled: true
config_file: .scss-lint.yml
stylelint:
config_file: .stylelintrc.json
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20.11.0
1 change: 1 addition & 0 deletions .sample.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# http://ddollar.github.com/foreman/
RACK_ENV=development
SECRET_KEY_BASE=development_secret
PORT=3000
Loading