Skip to content

Commit c637fdc

Browse files
committed
Bump fizzy-saas to enable console auditing
ref: https://app.fizzy.do/5986089/cards/2469 ref: basecamp/fizzy-saas#20
1 parent 373f4d5 commit c637fdc

File tree

3 files changed

+38
-7
lines changed

3 files changed

+38
-7
lines changed

Gemfile.saas

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@ eval_gemfile "Gemfile"
33

44
git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
55

6-
6+
# SaaS-only functionality
77
gem "activeresource", require: "active_resource"
88
gem "queenbee", bc: "queenbee-plugin"
9-
gem "fizzy-saas", bc: "fizzy-saas"
9+
gem "fizzy-saas", bc: "fizzy-saas", branch: "flavorjones/bake-in-console1984" # TODO: change back to main before merging
10+
gem "console1984", bc: "console1984"
11+
gem "audits1984", bc: "audits1984"
12+
13+
# Telemetry
1014
gem "rails_structured_logging", bc: "rails-structured-logging"
1115
gem "sentry-ruby"
1216
gem "sentry-rails"
13-
14-
# Telemetry
1517
gem "yabeda"
1618
gem "yabeda-actioncable"
1719
gem "yabeda-activejob", github: "basecamp/yabeda-activejob", branch: "bulk-and-scheduled-jobs"

Gemfile.saas.lock

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,32 @@
1+
GIT
2+
remote: https://github.com/basecamp/audits1984
3+
revision: c790eaec0716c8df56b3d0ab5bf5d75e3e1b0ed0
4+
specs:
5+
audits1984 (0.1.7)
6+
console1984
7+
importmap-rails (>= 1.2.1)
8+
rinku
9+
rouge
10+
turbo-rails
11+
12+
GIT
13+
remote: https://github.com/basecamp/console1984
14+
revision: 02b1b9ee7fd7050174b6a98c2b43057553621dc4
15+
specs:
16+
console1984 (0.2.2)
17+
irb (~> 1.13)
18+
parser
19+
rails (>= 7.0)
20+
rainbow
21+
122
GIT
223
remote: https://github.com/basecamp/fizzy-saas
3-
revision: f516ae03f981e080e5b4e55a8a2d8afb28de6f1d
24+
revision: f6a3192cbac016b66d0018ebffe28929cc3d6294
25+
branch: flavorjones/bake-in-console1984
426
specs:
527
fizzy-saas (0.1.0)
28+
audits1984
29+
console1984
630
prometheus-client-mmap (~> 1.4.0)
731
queenbee
832
rails (>= 8.1.0.beta1)
@@ -440,6 +464,7 @@ GEM
440464
reline (0.6.3)
441465
io-console (~> 0.5)
442466
rexml (3.4.4)
467+
rinku (2.0.6)
443468
rouge (4.6.1)
444469
rqrcode (3.1.0)
445470
chunky_png (~> 1.0)
@@ -610,6 +635,7 @@ PLATFORMS
610635

611636
DEPENDENCIES
612637
activeresource
638+
audits1984!
613639
autotuner
614640
aws-sdk-s3
615641
bcrypt (~> 3.1.7)
@@ -618,6 +644,7 @@ DEPENDENCIES
618644
brakeman
619645
bundler-audit
620646
capybara
647+
console1984!
621648
debug
622649
faker
623650
fizzy-saas!

app/helpers/login_helper.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
module LoginHelper
22
def login_url
3-
new_session_path(script_name: nil)
3+
# Use main_app because this helper may be invoked from an engine controller
4+
# that inherits from AdminController.
5+
main_app.new_session_path(script_name: nil)
46
end
57

68
def logout_url
7-
new_session_path
9+
main_app.new_session_path
810
end
911

1012
def redirect_to_login_url

0 commit comments

Comments
 (0)