Merge branch 'release/0.5.1'

CenterForOpenScience · Apr 24, 2018 · eb16bcd · eb16bcd
2 parents 7d90b48 + d7b7fa1
commit eb16bcd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 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).
 
+## [0.5.1] - 2018-04-24
+### Changed
+- Back to pinned osf-style commit
+
 ## [0.5.0] - 2018-04-24
 ### Added
 - `preprintPendingDOIMinted` translation string to show message when DOI is being minted

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reviews",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Center for Open Science Reviews Service",
   "license": "Apache-2.0",
   "author": "",
@@ -21,7 +21,6 @@
   "devDependencies": {
     "@centerforopenscience/ember-osf": "0.16.0",
     "@centerforopenscience/eslint-config": "^2.0.0",
-    "@centerforopenscience/osf-style": "1.7.0",
     "@cos-forks/ember-content-placeholders": "https://github.com/cos-forks/ember-content-placeholders#c85cdbeb4b9c206c3f76a92422db76815b2c95bc",
     "broccoli-asset-rev": "^2.4.5",
     "coveralls": "^3.0.0",
@@ -69,6 +68,7 @@
   },
   "private": true,
   "dependencies": {
+    "@centerforopenscience/osf-style": "https://github.com/CenterForOpenScience/osf-style#b09451d759c8544d2fab4bd7dbd5ca8b6dc242b8",
     "autoprefixer": "^7.1.2",
     "bootstrap-sass": "^3.3.7",
     "cssnano": "^3.10.0",

diff --git a/yarn.lock b/yarn.lock
@@ -104,9 +104,9 @@
     eslint-plugin-eslint-comments "^1.0.0"
     eslint-plugin-import "^2.7.0"
 
-"@centerforopenscience/osf-style@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@centerforopenscience/osf-style/-/osf-style-1.7.0.tgz#0ae3c0eaaca07fcf8bd667a7b3d7aeeb3244564d"
+"@centerforopenscience/osf-style@https://github.com/CenterForOpenScience/osf-style#b09451d759c8544d2fab4bd7dbd5ca8b6dc242b8":
+  version "1.6.0"
+  resolved "https://github.com/CenterForOpenScience/osf-style#b09451d759c8544d2fab4bd7dbd5ca8b6dc242b8"
 
 "@cos-forks/ember-content-placeholders@https://github.com/cos-forks/ember-content-placeholders#c85cdbeb4b9c206c3f76a92422db76815b2c95bc":
   version "0.5.0"