Skip to content

Commit

Permalink
Merge branch 'hotfix/0.113.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
jamescdavis committed Sep 26, 2017
2 parents da9c048 + b4f313c commit c3ca90a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 5 deletions.
11 changes: 11 additions & 0 deletions Dockerfile-alpine
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ARG BASE_IMAGE=quay.io/centerforopenscience/ember-osf-registries:develop-development-local

FROM ${BASE_IMAGE} AS base

FROM node:8-alpine AS dist

RUN mkdir -p /code

WORKDIR /code

COPY --from=base /code/dist /code/dist
2 changes: 1 addition & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<script>
(function() {
var encodedConfig = document.head.querySelector("meta[name$='/config/environment']").content;
var config = JSON.parse(decodeURIComponent(encodedConfig));
var config = JSON.parse(unescape(encodedConfig));
var assetSuffix = config.ASSET_SUFFIX ? '-' + config.ASSET_SUFFIX : '';
var origin = window.location.origin;
window.isProviderDomain = !~config.OSF.url.indexOf(origin);
Expand Down
10 changes: 8 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,19 @@ module.exports = function(defaults) {
enabled: useCdn,
content: `
<script src="https://cdn.ravenjs.com/3.5.1/ember/raven.min.js"></script>
<script>Raven.config("${config.sentryDSN}", {}).install();</script>`.trim()
<script>
var encodedConfig = document.head.querySelector("meta[name$='/config/environment']").content;
var config = JSON.parse(unescape(encodedConfig));
Raven.config(config.sentryDSN, {}).install();
</script>
`.trim()
},
cdn: {
enabled: useCdn,
content: `
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ember.js/2.7.1/ember.prod.js"></script>`.trim()
<script src="//cdnjs.cloudflare.com/ajax/libs/ember.js/2.7.1/ember.prod.js"></script>
`.trim()
},
},
postcssOptions: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "preprint-service",
"version": "0.113.6",
"version": "0.113.7",
"description": "Center for Open Science Preprint Service",
"private": true,
"directories": {
Expand Down
3 changes: 2 additions & 1 deletion testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ module.exports = {
"Chrome": [
"--headless",
"--disable-gpu",
"--remote-debugging-port=9222"
"--remote-debugging-port=9222",
"--no-sandbox",
]
}
};

0 comments on commit c3ca90a

Please sign in to comment.