diff --git a/CHANGELOG.md b/CHANGELOG.md index d67da86ee9..ca81f2af46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [1.7.4] - 2019-12-04 +### Added +- Addition of LinuxHost adapter to the Dashboard + +### Fixed +- Fixed bug where an unreadable cluster config (e.g. due to file permissions) would cause crashes + ## [1.7.3] - 2019-12-03 ### Added - `-u/--user` flag to `nginx_stage nginx_clean` subcommand [#315](https://github.com/OSC/ondemand/pull/315) @@ -315,7 +322,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - From 1.3.7 - 1.4.2 updated app versions -[Unreleased]: https://github.com/OSC/ondemand/compare/v1.7.3...HEAD +[Unreleased]: https://github.com/OSC/ondemand/compare/v1.7.4...HEAD +[1.7.4]: https://github.com/OSC/ondemand/compare/v1.7.3...v1.7.4 [1.7.3]: https://github.com/OSC/ondemand/compare/v1.7.2...v1.7.3 [1.7.2]: https://github.com/OSC/ondemand/compare/v1.7.1...v1.7.2 [1.7.1]: https://github.com/OSC/ondemand/compare/v1.7.0...v1.7.1 diff --git a/apps/dashboard/Gemfile.lock b/apps/dashboard/Gemfile.lock index 7628a406b5..04f0433109 100644 --- a/apps/dashboard/Gemfile.lock +++ b/apps/dashboard/Gemfile.lock @@ -74,7 +74,7 @@ GEM i18n erubi (1.9.0) execjs (2.7.0) - ffi (1.11.1) + ffi (1.11.3) font-awesome-sass (5.0.9) sass (>= 3.2) globalid (0.4.2) @@ -124,7 +124,7 @@ GEM ood_core (~> 0.1) rails (> 4.0.7, < 6.0) redcarpet (~> 3.2) - ood_core (0.9.3) + ood_core (0.10.0) ffi (~> 1.9, >= 1.9.6) ood_support (~> 0.0.2) ood_support (0.0.3) @@ -238,4 +238,4 @@ DEPENDENCIES uglifier (>= 1.3.0) BUNDLED WITH - 1.16.1 + 1.17.3