Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(halconfig): lint halconfig/settings.js #4146

Merged
merged 4 commits into from
Oct 6, 2017
Merged

chore(halconfig): lint halconfig/settings.js #4146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b213cf5
chore(halconfig): lint halconfig/settings.js
Sep 25, 2017
b9df949
Merge branch 'master' into make-halconfig-js
lwander Oct 5, 2017
fe976ca
Merge branch 'master' into make-halconfig-js
lwander Oct 5, 2017
d77319c
Merge branch 'master' into make-halconfig-js
anotherchrisberry Oct 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions halconfig/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ var feedbackUrl = '';
var gateHost = '{%gate.baseUrl%}';
var bakeryDetailUrl = (gateHost + '/bakery/logs/{{context.region}}/{{context.status.resourceId}}');
var authEndpoint = (gateHost + '/auth/user');
var authEnabled = {%features.auth%};
var chaosEnabled = {%features.chaos%};
var fiatEnabled = {%features.fiat%};
var jobsEnabled = {%features.jobs%};
var pipelineTemplatesEnabled = {%features.pipelineTemplates%};
var authEnabled = '{%features.auth%}' === 'true';
var chaosEnabled = '{%features.chaos%}' === 'true';
var fiatEnabled = '{%features.fiat%}' === 'true';
var jobsEnabled = '{%features.jobs%}' === 'true';
var pipelineTemplatesEnabled = '{%features.pipelineTemplates%}' === 'true';
var timezone = '{%timezone%}';
var version = '{%version%}';
var changelogGistId = '{%changelog.gist.id%}';
Expand All @@ -33,7 +33,7 @@ var kubernetes = {
var appengine = {
defaults: {
account: '{%appengine.default.account%}',
editLoadBalancerStageEnabled: {%appengine.enabled%}
editLoadBalancerStageEnabled: '{%appengine.enabled%}' === 'true'
}
};
var openstack = {
Expand Down Expand Up @@ -61,7 +61,7 @@ var dcos = {
};
var entityTagsEnabled = false;
var netflixMode = false;
var notifications = '{%notifications.enabled%}' === 'true'
var notificationsEnabled = '{%notifications.enabled%}' === 'true';
var slack = {
enabled: '{%notifications.slack.enabled%}' === 'true',
botName: '{%notifications.slack.botName%}'
Expand Down Expand Up @@ -138,7 +138,7 @@ window.spinnakerSettings = {
jobs: jobsEnabled,
pipelineTemplates: pipelineTemplatesEnabled,
pipelines: true,
notifications: notifications,
notifications: notificationsEnabled,
fastProperty: true,
vpcMigrator: true,
clusterDiff: false,
Expand Down
1 change: 1 addition & 0 deletions webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ function configure(IS_TEST) {
config.entry = {
settings: './settings.js',
settingsLocal: './settings-local.js',
halconfig: './halconfig/settings.js',
app: './app/scripts/app.ts',
vendor: [
'jquery', 'angular', 'angular-ui-bootstrap', 'source-sans-pro',
Expand Down