From d6fa17dcf4d2a4644e87c0e28dda10e366a98381 Mon Sep 17 00:00:00 2001 From: Geri Jennings Date: Tue, 18 Feb 2020 21:19:00 -0500 Subject: [PATCH 1/2] Update links on server status page - Remove the old Slack link and link to discourse instead - Update links that point to documentation, the Conjur repo, and AAM - Upgrade font-awesome to use the post-5.0 icon format --- Gemfile | 2 +- Gemfile.lock | 6 +++--- NOTICES.txt | 4 ++-- app/views/shared/_footer.html.erb | 2 +- app/views/shared/_navigation.html.erb | 4 ++-- app/views/status/index.html.erb | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 6d1d974e24..4ab85d5e4f 100644 --- a/Gemfile +++ b/Gemfile @@ -59,7 +59,7 @@ gem 'uglifier' gem 'autoprefixer-rails' gem 'bootstrap-sass', '~> 3.4.0' gem 'dry-struct' -gem 'font-awesome-sass', '~> 4.7.0' +gem 'font-awesome-sass', '~> 5.12.0' gem 'net-ldap' # for AWS rotator diff --git a/Gemfile.lock b/Gemfile.lock index fffe8738a0..406e88c09f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -184,8 +184,8 @@ GEM excon (0.71.0) execjs (2.7.0) ffi (1.9.25) - font-awesome-sass (4.7.0) - sass (>= 3.2) + font-awesome-sass (5.12.0) + sassc (>= 1.11) gherkin (4.1.1) gli (2.17.1) globalid (0.4.2) @@ -473,7 +473,7 @@ DEPENDENCIES debase dry-struct ffi (>= 1.9.24) - font-awesome-sass (~> 4.7.0) + font-awesome-sass (~> 5.12.0) gli haikunator (~> 1) iso8601 diff --git a/NOTICES.txt b/NOTICES.txt index 4eb9aa740f..d23b07cfcc 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -47,7 +47,7 @@ SECTION 4: MIT License >>> https://rubygems.org/gems/autoprefixer-rails/versions/7.1.2.3 >>> https://rubygems.org/gems/bootstrap-sass/versions/3.4.1 >>> https://rubygems.org/gems/dry-struct/versions/0.4.0 ->>> https://rubygems.org/gems/font-awesome-sass/versions/4.7.0 +>>> https://rubygems.org/gems/font-awesome-sass/versions/5.12.0 >>> https://rubygems.org/gems/net-ldap/versions/0.16.1 >>> https://rubygems.org/gems/rails_12factor/versions/0.0.3 >>> https://rubygems.org/gems/jwt @@ -802,7 +802,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ->>> https://rubygems.org/gems/font-awesome-sass/versions/4.7.0 +>>> https://rubygems.org/gems/font-awesome-sass/versions/5.12.0 Copyright (c) 2013 Travis Chase diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index ad53e0c4ba..77619a14da 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -5,7 +5,7 @@ <%= image_tag "cyberark-white.png", alt: "CyberArk Logo", class: "cyberark-sidebar-logo" %>
- Conjur Community Edition copyright © <%= Time.current.year %> CyberArk. All rights reserved. + Conjur Open Source copyright © <%= Time.current.year %> CyberArk. All rights reserved.
diff --git a/app/views/shared/_navigation.html.erb b/app/views/shared/_navigation.html.erb index 2c458e5ae1..b8a44c5e3b 100644 --- a/app/views/shared/_navigation.html.erb +++ b/app/views/shared/_navigation.html.erb @@ -13,8 +13,8 @@ diff --git a/app/views/status/index.html.erb b/app/views/status/index.html.erb index c04d83192a..3d48d4484d 100644 --- a/app/views/status/index.html.erb +++ b/app/views/status/index.html.erb @@ -29,7 +29,7 @@ Conjur+TLS guide to learn how to deploy Conjur securely & - contact CyberArk + contact CyberArk with any questions. @@ -41,8 +41,8 @@ More Info: From 73de3d5093a236dd9cacf55773023d97f0a08caf Mon Sep 17 00:00:00 2001 From: Geri Jennings Date: Tue, 18 Feb 2020 21:21:09 -0500 Subject: [PATCH 2/2] Update links on server status page - Remove the old Slack link and link to discourse instead - Update links that point to documentation, the Conjur repo, and AAM - Upgrade font-awesome to use the post-5.0 icon format --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cab57e02b1..5e8e0ff7bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Improved flows and rules around user creation - Kubernetes authenticator now returns 403 on unpermitted hosts instead of a 401 +### Fixed +- Updated broken links on server status page (#1341) + ## [1.4.6] - 2020-01-21 ### Changed