Merge pull request #2108 from NCEAS/develop

2.23.0 Release

.gitignore

@@ -8,6 +8,7 @@ src/js/themes/dangermond
 src/js/themes/sfwmd
 src/js/themes/cerp
 src/js/themes/drp
+src/js/themes/sctld
 node_modules
 src/config/dev
 docs/_site

CONTRIBUTING.md

@@ -2,14 +2,16 @@
 
 :tada: First off, thanks for contributing! :tada:
 
-- [Types of contributions](#types-of-contributions)
-- [Pull Requests](#pull-requests)
-- [Development Workflow](#development-workflow)
-- [Release process](#release-process)
-- [Testing](#testing)
-- [Code style](#code-style)
-- [Documentation](#documentation)
-- [Contributor license agreement](#contributor-license-agreement)
+- [Contributing to MetacatUI](#contributing-to-metacatui)
+  - [Types of contributions](#types-of-contributions)
+  - [Pull Requests](#pull-requests)
+  - [Development Workflow](#development-workflow)
+    - [Development flow overview](#development-flow-overview)
+  - [Release process](#release-process)
+  - [Testing](#testing)
+  - [Code style](#code-style)
+  - [Documentation](#documentation)
+  - [Contributor license agreement](#contributor-license-agreement)
 
 ## Types of contributions
 
@@ -48,23 +50,16 @@ In short:
 
 Development is managed through the git repository at https://github.com/NCEAS/metacatui.  The repository is organized into several branches, each with a specific purpose.  
 
-**main**. The `main` branch represents a stable branch that is constantly maintained in a state ready for release. Any unreleased code changes on the main branch represent changes that have been tested and staged for the next release. When a set of features are mature and tested and ready for release, they are merged onto the `main` branch to await the next release.  The tip of the main branch always represents the set of features that have been staged for the next release. The version number in all configuration files and the README on the main branch follows [semantic versioning](https://semver.org/) and should always be set to either:
+**main**. Releases are merged from the `develop` branch to the `main` branch, and the resulting commit is tagged with the release tag (e.g., `2.4.0`). The tip of the `main` branch always reflects the most recent release of the software. The version number in all configuration files and the README on the main branch follows [semantic versioning](https://semver.org/) and should always be set to the current release version, for example, `2.8.5`.
 
-- the current release version, if the HEAD of `main` still matches the HEAD of `releases`. For example, `2.8.5`.
-- the planned next release number with a `beta` designator or release candidate `rc` designator appended as appropriate.  For example, `2.8.6-beta1` or `2.9.0-rc1`.
-
-**releases**. Releases are merged from the `main` branch to the `releases` branch, and the resulting commit is tagged with the release tag (e.g., `2.4.0`). The tip of the `releases` branch always reflects the most recent release of the software.
-
-**develop**. Development takes place on a single branch for integrated development and testing of the set of features
-targeting a particular release. Commits should only be pushed to this branch once they are ready to be deployed to
-production immediately after being pushed.
+**develop**. The `develop` branch is a stable branch that is constantly maintained in a state ready for release. Commits should only be pushed to this branch once they are ready to be deployed to production immediately after being pushed. Any unreleased code changes on the develop branch represent changes that have been tested and staged for the next release. The tip of the develop branch always represents the set of features that have been staged for the next release. Commits are added to the develop branch via a pull request or after consultation with the designated MetacatUI product owner.
 
 **feature**. to isolate development on a specific set of capabilities, especially if it may be disruptive to other developers working on the main `develop` branch, feature branches should be created.
 
-Feature branches are named as `feature-` + `-{short-description}-` + `#{issue}`. With `{issue}` being the Github issue number related to that new feature. e.g. `feature-new-search-#1456`.
+Feature branches are named as `feature-` + `#{issue}` + `-{short-description}-`. With `{issue}` being the Github issue number related to that new feature. e.g. `feature-#1456-new-search`.
 
-All `feature-*` branches should be frequently merged with changes from `main` to
-ensure that the development branch stays up to date with other features that have
+All `feature-*` branches should be frequently merged with changes from `develop` to
+ensure that the feature branch stays up to date with other features that have
 been tested and are awaiting release.  Thus, each `feature-*` branch represents an opportunity
 for integration testing of the set of features intended to work together for a
 particular release.
@@ -81,10 +76,7 @@ needs to be created that is behind the main **develop** branch.
 changes that are desired in a release are merged into the `develop` branch, we run
 the full set of tests on a clean checkout of the `develop` branch.
 2. After testing, the `develop` branch is merged to main.
-3. Then the main branch can be merged to the `releases` branch, and tagged with
-the new version number (e.g. `2.11.2`). At
-this point, the tip of the `releases` branch will reflect the new release and
-the main branch is ready for work on the next release.
+3. Then the `main` branch can be tagged with the new version number (e.g. `2.11.2`).
 4. Releases can be downloaded from the [Github releases page for the MetacatUI repository](https://github.com/NCEAS/metacatui/releases).
 
 ## Testing

README.md

@@ -1,6 +1,7 @@
 ## MetacatUI: A client-side web interface for DataONE data repositories
 
 - **Author**: Matthew B. Jones, Chris Jones, Lauren Walker, Robyn Thiessen-Bock, Ben Leinfelder, Peter Slaughter, Bryce Mecum, Rushiraj Nenuji ([NCEAS](https://www.nceas.ucsb.edu)), Hesham Elbashandy, Val Hendrix 
+- **DOI**: [doi:10.18739/A25M6282K](https://doi.org/10.18739/A25M6282K)
 - **License**: [Apache 2](http://opensource.org/licenses/Apache-2.0)
 - [Package source code on Github](https://github.com/NCEAS/metacatui)
 - [**Submit Bugs and feature requests**](https://github.com/NCEAS/metacatui/issues/new/choose)
@@ -12,6 +13,12 @@ MetacatUI is a client-side web interface for querying Metacat servers and other
 
 MetacatUI is an open source, community project.  We [welcome contributions](https://github.com/NCEAS/metacatui/blob/main/CONTRIBUTING.md) in many forms, including code, graphics, documentation, bug reports, testing, etc.  Use the [discussion list](https://github.com/NCEAS/metacatui/issues) to discuss these contributions with us.
 
+## Citation
+
+Cite this software as:
+
+> Matthew B. Jones, Chris Jones, Lauren Walker, Robyn Thiessen-Bock, Ben Leinfelder, Peter Slaughter, Bryce Mecum, Rushiraj Nenuji, Hesham Elbashandy, Val Hendrix. 2022. MetacatUI: A client-side web interface for DataONE data repositories (version 2.23.0). Arctic Data Center. [doi:10.18739/A25M6282K](https://doi.org/10.18739/A25M6282K)
+
 ## Screenshots
 
 The main search view

docs/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.6)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -16,7 +16,7 @@ GEM
     colorator (1.1.0)
     commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.2.0)
     dnsruby (1.61.5)
       simpleidn (~> 0.1)
     em-websocket (0.5.2)
@@ -210,9 +210,9 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.14.4)
+    minitest (5.17.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.6)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.20.0)
@@ -256,7 +256,7 @@ GEM
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
     wdm (0.1.1)
-    zeitwerk (2.4.2)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

docs/_config.yml

@@ -1,3 +1,3 @@
 url: "/metacatui"
 highlighter: "rouge"
-version: "2.22.0"
+version: "2.23.0"

docs/_includes/nav.html

@@ -7,6 +7,7 @@ <h2>Installation</h2>
   <h2>Themes</h2>
   <a href="{{ site.url }}/install/configuration/index.html">Create a custom theme</a>
   <a href="{{ site.url }}/guides/themes/images.html">Images</a>
+  <a href="{{ site.url }}/guides/themes/citations.html">Citations</a>
 
   <h2>API</h2>
   <a href="{{ site.url }}/docs/AppConfig.html">Configuration</a>