mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
DEV: Remove RAILS_MASTER flag from Gemfile (#24574)
We don't use this flag, and it prevents Dependabot from being able to automatically create PRs for Rails gem updates
This commit is contained in:
11
.github/dependabot.yml
vendored
11
.github/dependabot.yml
vendored
@@ -40,6 +40,17 @@ updates:
|
|||||||
versions:
|
versions:
|
||||||
- "> 1.2.0"
|
- "> 1.2.0"
|
||||||
- "< 2"
|
- "< 2"
|
||||||
|
groups:
|
||||||
|
rails:
|
||||||
|
patterns:
|
||||||
|
- "actionmailer"
|
||||||
|
- "actionpack"
|
||||||
|
- "actionview"
|
||||||
|
- "actionmodel"
|
||||||
|
- "activerecord"
|
||||||
|
- "activesupport"
|
||||||
|
- "railties"
|
||||||
|
- "sprockets-rails"
|
||||||
- package-ecosystem: "npm"
|
- package-ecosystem: "npm"
|
||||||
directory: "/app/assets/javascripts/"
|
directory: "/app/assets/javascripts/"
|
||||||
schedule:
|
schedule:
|
||||||
|
|||||||
28
Gemfile
28
Gemfile
@@ -6,28 +6,14 @@ source "https://rubygems.org"
|
|||||||
|
|
||||||
gem "bootsnap", require: false, platform: :mri
|
gem "bootsnap", require: false, platform: :mri
|
||||||
|
|
||||||
def rails_master?
|
gem "actionmailer"
|
||||||
ENV["RAILS_MASTER"] == "1"
|
gem "actionpack"
|
||||||
end
|
gem "actionview"
|
||||||
|
gem "activemodel"
|
||||||
if rails_master?
|
gem "activerecord"
|
||||||
gem "arel", git: "https://github.com/rails/arel.git"
|
gem "activesupport"
|
||||||
gem "rails", git: "https://github.com/rails/rails.git"
|
gem "railties"
|
||||||
else
|
|
||||||
# NOTE: Until rubygems gives us optional dependencies we are stuck with this needing to be explicit
|
|
||||||
# this allows us to include the bits of rails we use without pieces we do not.
|
|
||||||
#
|
|
||||||
# To issue a rails update bump the version number here
|
|
||||||
rails_version = "7.0.7"
|
|
||||||
gem "actionmailer", rails_version
|
|
||||||
gem "actionpack", rails_version
|
|
||||||
gem "actionview", rails_version
|
|
||||||
gem "activemodel", rails_version
|
|
||||||
gem "activerecord", rails_version
|
|
||||||
gem "activesupport", rails_version
|
|
||||||
gem "railties", rails_version
|
|
||||||
gem "sprockets-rails"
|
gem "sprockets-rails"
|
||||||
end
|
|
||||||
|
|
||||||
gem "json"
|
gem "json"
|
||||||
|
|
||||||
|
|||||||
14
Gemfile.lock
14
Gemfile.lock
@@ -530,14 +530,14 @@ PLATFORMS
|
|||||||
x86_64-linux
|
x86_64-linux
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
actionmailer (= 7.0.7)
|
actionmailer
|
||||||
actionpack (= 7.0.7)
|
actionpack
|
||||||
actionview (= 7.0.7)
|
actionview
|
||||||
actionview_precompiler
|
actionview_precompiler
|
||||||
active_model_serializers (~> 0.8.3)
|
active_model_serializers (~> 0.8.3)
|
||||||
activemodel (= 7.0.7)
|
activemodel
|
||||||
activerecord (= 7.0.7)
|
activerecord
|
||||||
activesupport (= 7.0.7)
|
activesupport
|
||||||
addressable
|
addressable
|
||||||
annotate
|
annotate
|
||||||
aws-sdk-s3
|
aws-sdk-s3
|
||||||
@@ -624,7 +624,7 @@ DEPENDENCIES
|
|||||||
rails-dom-testing
|
rails-dom-testing
|
||||||
rails_failover
|
rails_failover
|
||||||
rails_multisite
|
rails_multisite
|
||||||
railties (= 7.0.7)
|
railties
|
||||||
rake
|
rake
|
||||||
rb-fsevent
|
rb-fsevent
|
||||||
rbtrace
|
rbtrace
|
||||||
|
|||||||
Reference in New Issue
Block a user