Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into bugfix-2553-orcid-…
Browse files Browse the repository at this point in the history
…formatting
  • Loading branch information
rushirajnenuji committed Dec 19, 2024
2 parents 594caa4 + 5d22065 commit d888e74
Show file tree
Hide file tree
Showing 27 changed files with 3,227 additions and 2,453 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ src/js/themes/cerp
src/js/themes/drp
src/js/themes/sctld
src/js/themes/smithsonian
src/js/themes/cib
node_modules
src/config/dev
docs/_site
Expand Down
4 changes: 1 addition & 3 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.3.6)
strscan
rexml (3.3.9)
rouge (3.30.0)
rubyzip (2.3.2)
safe_yaml (1.0.5)
Expand All @@ -251,7 +250,6 @@ GEM
faraday (>= 0.17.3, < 3)
simpleidn (0.2.1)
unf (~> 0.1.4)
strscan (3.1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
typhoeus (1.4.1)
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.6.0
version: 1.0.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "2.30.0"
appVersion: "2.31.0"
Binary file removed helm/templates/.ingress.yaml.swp
Binary file not shown.
30 changes: 15 additions & 15 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"@actions/core": "^1.9.1",
"cheerio": "^1.0.0-rc.11",
"express": "^4.21.0",
"express": "^4.21.1",
"fomantic-ui": "^2.9.4-beta.65",
"puppeteer": "^22.11.2",
"sinon": "^17.0.1"
Expand Down
Loading

0 comments on commit d888e74

Please sign in to comment.