Skip to content

Commit

Permalink
Merge branch 'main' into action_menu_forward_overlay_args
Browse files Browse the repository at this point in the history
  • Loading branch information
camertron authored Jun 25, 2024
2 parents ec53cc4 + 11b3b18 commit 0454702
Show file tree
Hide file tree
Showing 30 changed files with 435 additions and 1,440 deletions.
5 changes: 0 additions & 5 deletions .changeset/perfect-jobs-pretend.md

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get specific changed files
id: changed-files
uses: tj-actions/changed-files@v44.5.2
uses: tj-actions/changed-files@v44.5.4
with:
files: |
docs/**/*.md
Expand All @@ -39,7 +39,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get specific changed files
id: changed-files
uses: tj-actions/changed-files@v44.5.2
uses: tj-actions/changed-files@v44.5.4
with:
files: |
app/**/*.rb
Expand All @@ -62,7 +62,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v44.5.2
uses: tj-actions/changed-files@v44.5.4
with:
files: |
app/components/**/*.erb
Expand All @@ -82,7 +82,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v44.5.2
uses: tj-actions/changed-files@v44.5.4
with:
files: |
app/components/**/*.ts
Expand All @@ -103,7 +103,7 @@ jobs:
- uses: actions/checkout@v4
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v44.5.2
uses: tj-actions/changed-files@v44.5.4
with:
files: |
app/components/**/*.pcss
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
release-canary:
name: npm
if: ${{ github.repository == 'primer/view_components' }}
uses: primer/.github/.github/workflows/release_canary.yml@v2.1.0
uses: primer/.github/.github/workflows/release_canary.yml@v2.1.1
with:
install: npm i
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-candidate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
release-candidate:
name: npm
if: ${{ github.repository == 'primer/view_components' }}
uses: primer/.github/.github/workflows/release_candidate.yml@v2.1.0
uses: primer/.github/.github/workflows/release_candidate.yml@v2.1.1
secrets:
gh_token: ${{ secrets.GITHUB_TOKEN }}
npm_token: ${{ secrets.NPM_AUTH_TOKEN_SHARED }}
2 changes: 1 addition & 1 deletion .github/workflows/release_tracking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ on:
jobs:
release-tracking:
name: Release Tracking
uses: primer/.github/.github/workflows/release_tracking.yml@v2.1.0
uses: primer/.github/.github/workflows/release_tracking.yml@v2.1.1
secrets:
datadog_api_key: ${{ secrets.DATADOG_API_KEY }}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# CHANGELOG

## 0.26.1

### Patch Changes

- [#2909](https://github.com/primer/view_components/pull/2909) [`e74e20a`](https://github.com/primer/view_components/commit/e74e20aa11c3531c350ebd6665cb2415b07b6f47) Thanks [@camertron](https://github.com/camertron)! - Revert tab-container-element upgrade

## 0.26.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
primer_view_components (0.26.0)
primer_view_components (0.26.1)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
octicons (>= 18.0.0)
Expand Down
2 changes: 1 addition & 1 deletion demo/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ gem "bootsnap", ">= 1.4.2", require: false

gem "primer_view_components", path: "../"
gem "view_component", '>= 3.11.0'
gem "lookbook", "~> 2.3.1" unless rails_version.to_f < 7
gem "lookbook", "~> 2.3.2" unless rails_version.to_f < 7

group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
Expand Down
28 changes: 14 additions & 14 deletions demo/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: ..
specs:
primer_view_components (0.26.0)
primer_view_components (0.26.1)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
octicons (>= 18.0.0)
Expand Down Expand Up @@ -47,8 +47,8 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
azure_mgmt_container_service (0.22.0)
ms_rest_azure (~> 0.12.0)
base64 (0.2.0)
Expand All @@ -69,7 +69,7 @@ GEM
drb (2.2.1)
dry-inflector (0.3.0)
ejson (1.4.1)
erubi (1.12.0)
erubi (1.13.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -141,7 +141,7 @@ GEM
activesupport (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.7.2)
irb (1.13.1)
irb (1.13.2)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jsonpath (1.1.5)
Expand Down Expand Up @@ -206,7 +206,7 @@ GEM
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
lookbook (2.3.1)
lookbook (2.3.2)
activemodel
css_parser
htmlbeautifier (~> 1.3)
Expand All @@ -223,7 +223,7 @@ GEM
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0507)
minitest (5.23.1)
minitest (5.24.0)
ms_rest (0.7.6)
concurrent-ruby (~> 1.0)
faraday (>= 0.9, < 2.0.0)
Expand All @@ -245,7 +245,7 @@ GEM
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
racc (~> 1.4)
octicons (19.9.0)
octicons (19.10.0)
oj (3.16.3)
bigdecimal (>= 3.0)
os (1.1.4)
Expand All @@ -257,11 +257,11 @@ GEM
pry (>= 0.13, < 0.15)
psych (5.1.2)
stringio
public_suffix (5.0.5)
public_suffix (6.0.0)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
rack (3.1.0)
rack (3.1.4)
rack-cors (2.0.2)
rack (>= 2.0.0)
rack-session (2.0.0)
Expand Down Expand Up @@ -294,7 +294,7 @@ GEM
psych (>= 4.0.0)
recursive-open-struct (1.1.3)
redcarpet (3.6.0)
reline (0.5.7)
reline (0.5.9)
io-console (~> 0.5)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
Expand Down Expand Up @@ -322,7 +322,7 @@ GEM
statsd-instrument (3.7.0)
stimulus-rails (1.3.3)
railties (>= 6.0.0)
stringio (3.1.0)
stringio (3.1.1)
thor (1.3.1)
timeliness (0.3.10)
turbo-rails (2.0.5)
Expand All @@ -340,7 +340,7 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
yard (0.9.36)
zeitwerk (2.6.14)
zeitwerk (2.6.16)

PLATFORMS
arm64-darwin-21
Expand All @@ -365,7 +365,7 @@ DEPENDENCIES
kuby-core (~> 0.20)
kuby-kind (~> 0.2)
listen
lookbook (~> 2.3.1)
lookbook (~> 2.3.2)
primer_view_components!
pry-byebug
puma (~> 6.4.2)
Expand Down
96 changes: 42 additions & 54 deletions demo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"private": true,
"version": "0.1.0",
"dependencies": {
"@primer/css": "^21.3.1",
"@primer/primitives": "^8.2.2",
"@primer/css": "^21.3.3",
"@primer/primitives": "^8.2.3",
"@rails/actioncable": "^7.1.3",
"@rails/ujs": "^7.1.3",
"turbolinks": "^5.2.0",
Expand Down
Loading

0 comments on commit 0454702

Please sign in to comment.