Skip to content

Commit

Permalink
Merge pull request #4441 from brave-intl/staging
Browse files Browse the repository at this point in the history
Prod Release: 2024-05-17
  • Loading branch information
tsmartt authored May 17, 2024
2 parents 8ae2887 + b58aeb2 commit c5bd4d8
Show file tree
Hide file tree
Showing 8 changed files with 402 additions and 12,033 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RUN gem install nokogiri
RUN bundle install --jobs 20

ENV NVM_DIR /usr/local/nvm
ENV NODE_VERSION 18.15.0
ENV NODE_VERSION 18.17.0
ENV NODE_OPTIONS=--openssl-legacy-provider
ENV NODE_PATH $NVM_DIR/versions/node/v$NODE_VERSION/lib/node_modules
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
Expand Down
4 changes: 3 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,8 @@ GEM
railties (>= 5.2)
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.6)
rexml (3.2.7)
strscan (>= 3.0.9)
rotp (6.3.0)
rouge (4.2.0)
rqrcode (2.2.0)
Expand Down Expand Up @@ -656,6 +657,7 @@ GEM
stringio (3.1.0)
strong_migrations (1.7.0)
activerecord (>= 5.2)
strscan (3.1.0)
temping (4.1.1)
activerecord (>= 6.0, < 7.2)
activesupport (>= 6.0, < 7.2)
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
Rails.configuration.pub_secrets[:twitter_client_secret],
{
callback_path: "/publishers/auth/register_twitter_channel/callback",
scope: "users.read",
scope: "tweet.read users.read",
name: "register_twitter_channel"
}

Expand Down
Loading

0 comments on commit c5bd4d8

Please sign in to comment.