diff --git a/ghost/admin/app/mirage/fixtures/settings.js b/ghost/admin/app/mirage/fixtures/settings.js index ced1047f56..050d4be1fd 100644 --- a/ghost/admin/app/mirage/fixtures/settings.js +++ b/ghost/admin/app/mirage/fixtures/settings.js @@ -125,7 +125,7 @@ export default [ id: 12, uuid: 'd806f358-7996-4c74-b153-8876959c4b70', key: 'labs', - value: '{"subscribers":true,"internalTags":true}', + value: '{"subscribers":true}', type: 'blog', created_at: '2015-01-12T18:29:01.000Z', created_by: 1, diff --git a/ghost/admin/app/models/tag.js b/ghost/admin/app/models/tag.js index 7504ec24b1..925e9939b7 100644 --- a/ghost/admin/app/models/tag.js +++ b/ghost/admin/app/models/tag.js @@ -32,19 +32,18 @@ export default Model.extend(ValidationEngine, { setVisibility() { let internalRegex = /^#.?/; - this.set('visibility', internalRegex.test(this.get('name')) ? 'internal' : 'public'); }, save() { - if (this.get('feature.internalTags') && this.get('changedAttributes.name') && !this.get('isDeleted')) { + if (this.get('changedAttributes.name') && !this.get('isDeleted')) { this.setVisibility(); } return this._super(...arguments); }, - setVisibilityOnNew: observer('feature.internalTags', 'isNew', 'isSaving', 'name', function () { - if (this.get('isNew') && !this.get('isSaving') && this.get('feature.internalTags')) { + setVisibilityOnNew: observer('isNew', 'isSaving', 'name', function () { + if (this.get('isNew') && !this.get('isSaving')) { this.setVisibility(); } }) diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js index 7e1f0eda1d..36ca67d549 100644 --- a/ghost/admin/app/services/feature.js +++ b/ghost/admin/app/services/feature.js @@ -30,7 +30,6 @@ export default Service.extend({ publicAPI: feature('publicAPI'), subscribers: feature('subscribers'), - internalTags: feature('internalTags'), _settings: null, diff --git a/ghost/admin/app/templates/components/gh-tag.hbs b/ghost/admin/app/templates/components/gh-tag.hbs index 50ef895c41..8e9e7f78af 100644 --- a/ghost/admin/app/templates/components/gh-tag.hbs +++ b/ghost/admin/app/templates/components/gh-tag.hbs @@ -3,10 +3,8 @@ {{tag.name}} /{{tag.slug}} - {{#if feature.internalTags}} - {{#if tag.isInternal}} - internal - {{/if}} + {{#if tag.isInternal}} + internal {{/if}}

{{tag.description}}

diff --git a/ghost/admin/app/templates/posts.hbs b/ghost/admin/app/templates/posts.hbs index 65de36f706..9621c30c77 100644 --- a/ghost/admin/app/templates/posts.hbs +++ b/ghost/admin/app/templates/posts.hbs @@ -41,13 +41,11 @@ {{/if}} {{/if}} - {{#if feature.internalTags}} -
- {{#each post.internalTags as |tag|}} - {{tag.name}} - {{/each}} -
- {{/if}} +
+ {{#each post.internalTags as |tag|}} + {{tag.name}} + {{/each}} +
{{/link-to}} {{/gh-posts-list-item}} diff --git a/ghost/admin/app/templates/settings/labs.hbs b/ghost/admin/app/templates/settings/labs.hbs index e3b7cbff25..5f6ad01467 100644 --- a/ghost/admin/app/templates/settings/labs.hbs +++ b/ghost/admin/app/templates/settings/labs.hbs @@ -53,9 +53,6 @@ {{#gh-feature-flag "subscribers"}} Subscribers - Collect email addresses from your readers, more info in the docs {{/gh-feature-flag}} - {{#gh-feature-flag "internalTags"}} - Internal Tags - tags which don't show up in your theme, more info in the docs. - {{/gh-feature-flag}}