Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prod Release 09-18-2024 #4504

Merged
merged 27 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5a479cf
build(deps): bump rexml from 3.3.2 to 3.3.3 (#4491)
dependabot[bot] Aug 6, 2024
cf7d62f
First pass at getting new UI testing down (#4487)
tsmartt Aug 12, 2024
37334f2
build(deps): bump fugit from 1.11.0 to 1.11.1 (#4495)
dependabot[bot] Aug 19, 2024
3d05dda
Update bootstrap to 5 (#4493)
tsmartt Aug 20, 2024
acb6822
Don't expire the sessions in redis so soon (#4497)
tsmartt Aug 20, 2024
0610bae
Add contribution banner customizer, migrate public channel page files
jlbyrne Jul 24, 2024
5f8417e
Merge pull request #4494 from brave-intl/feat/contribution-banner
jlbyrne Aug 21, 2024
4558e4d
fix no social link bug, fix no channels bug, styling fixes, linting, …
jlbyrne Aug 27, 2024
7a9a1b3
yarn audit
jlbyrne Aug 28, 2024
b3eff59
fix loading error
jlbyrne Aug 28, 2024
3246f37
update gemfile
jlbyrne Aug 28, 2024
d76b249
remove direct reference to dom
jlbyrne Aug 29, 2024
d40fd03
Merge pull request #4499 from brave-intl/fix/contribution-page
jlbyrne Aug 29, 2024
92926dd
Add contribution banner customizer, migrate public channel page files
jlbyrne Jul 24, 2024
ece9c7c
Add routing for public channel pages, add layout and style fixes
jlbyrne Aug 21, 2024
16d57c0
Merge pull request #4500 from brave-intl/feat/public-channel-page
jlbyrne Aug 29, 2024
540b91e
Further fixes for the contribution page, some nala corrections and up…
jlbyrne Sep 4, 2024
0413dc0
Merge pull request #4501 from brave-intl/fix/contribution-page-ii
jlbyrne Sep 9, 2024
d9bf523
get rid of typo in image upload and unnecessary file extensions
jlbyrne Sep 12, 2024
2fc5214
Merge pull request #4502 from brave-intl/fix/pcdn-image-issues
jlbyrne Sep 16, 2024
20cce06
add japanese translations, styling and bug fixes for contributions page
jlbyrne Sep 17, 2024
ca1a982
Merge pull request #4503 from brave-intl/fix/translations-contributio…
jlbyrne Sep 18, 2024
195beb4
build(deps): bump next from 14.2.3 to 14.2.12 in /nextjs
dependabot[bot] Sep 18, 2024
5a970ec
replace google gemini icon with gemini custodian icon
jlbyrne Sep 18, 2024
2854b06
fix disabled button and spacing issue with social links
jlbyrne Sep 18, 2024
56d4af2
Merge pull request #4505 from brave-intl/dependabot/npm_and_yarn/next…
jlbyrne Sep 18, 2024
165f79b
Merge pull request #4506 from brave-intl/fix/gemini-icon
jlbyrne Sep 18, 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
5 changes: 4 additions & 1 deletion .audit-ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
"GHSA-78xj-cgh5-2h22",
"GHSA-c429-5p7v-vgjp",
"GHSA-cxjh-pqwp-8mfp|react-scripts>webpack-dev-server>http-proxy-middleware>http-proxy>follow-redirects",
"GHSA-67hx-6x53-jw92"
"GHSA-67hx-6x53-jw92",
"GHSA-49q7-c7j4-3p7m|crypto-browserify>browserify-sign>elliptic",
"GHSA-977x-g7h5-7qgw|crypto-browserify>browserify-sign>elliptic",
"GHSA-f7q4-pwc6-w24p|crypto-browserify>browserify-sign>elliptic"
]
}
14 changes: 9 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3.1
- name: Setup firefox
uses: browser-actions/setup-firefox@0f622aed2a492183149a5a5c347205a593802e10 # v1.3.0
with:
firefox-version: "latest-esr"
- name: Bundle install
run: |
bundle config path vendor/bundle
Expand All @@ -64,12 +60,20 @@ jobs:
run: cd public/creators-landing && yarn install && yarn build
env:
process.env.CI : false
- name: NewUI install
run: cd nextjs && npm install
env:
process.env.CI: false
- name: NewUI build
run: cd nextjs && node scripts/copyLeoIcons.js && npm run build
env:
process.env.CI: false
- name: Prepare database
run: PREPARING_DATABASE=1 RAILS_ENV=test bundle exec rails db:prepare
env:
DATABASE_URL_TEST: postgres://postgres:postgres@localhost:5432/brave_publishers_test
- name: Run tests
run: USE_MINITEST_RETRY=1 NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=test bundle exec rails test
run: USE_MINITEST_RETRY=1 NODE_OPTIONS=--openssl-legacy-provider RAILS_ENV=test ./bin/run_tests.sh
env:
DATABASE_URL_TEST: postgres://postgres:postgres@localhost:5432/brave_publishers_test
BAT_RATIOS_URL: https://ratios.rewards.bravesoftware.com
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ gem "activerecord-postgres_enum"
# Use AWS gem for s3 uploads
gem "aws-sdk-s3", "~> 1.143.0"

gem "bootstrap", "4.6.2"
gem "bootstrap", "5.3.3"

gem "brotli", "~> 0.5.0"

Expand Down Expand Up @@ -116,7 +116,7 @@ gem "redis-session-store"
gem "render_async", "~> 2.1"

# For ruby 3
gem "rexml"
gem "rexml", ">= 3.3.6"

# Generate QR codes for TOTP 2fa
gem "rqrcode", "~> 2.2.0"
Expand Down
Loading
Loading