Skip to content

Commit b469054

Browse files
committed
remove no-longer-needed feature flag
1 parent 535dae5 commit b469054

3 files changed

Lines changed: 8 additions & 27 deletions

File tree

lib/all-versions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const plans = [
1010
{ // free-pro-team is **not** a user-facing version and is stripped from URLs.
1111
// See lib/remove-fpt-from-path.js for details.
1212
plan: 'free-pro-team',
13-
planTitle: process.env.FEATURE_REMOVE_FPT ? 'GitHub.com' : 'Free, Pro, and Team',
13+
planTitle: 'Free, Pro, and Team',
1414
releases: [latestNonNumberedRelease],
1515
latestRelease: latestNonNumberedRelease,
1616
nonEnterpriseDefault: true, // permanent way to refer to this plan if the name changes

lib/redirects/get-old-paths-from-permalink.js

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,13 @@ module.exports = function getOldPathsFromPath (currentPath, languageCode, curren
5757
// ------ BEGIN MODERN VERSION FORMAT REPLACEMENTS ------//
5858
if (currentlySupportedVersions.includes(currentVersion) || versionSatisfiesRange(currentVersion, `>${lastReleaseWithLegacyFormat}`)) {
5959
(new Set(oldPaths)).forEach(oldPath => {
60-
if (!process.env.FEATURE_REMOVE_FPT) {
61-
// create old path /github from new path /free-pro-team@latest/github
62-
oldPaths.add(oldPath
63-
.replace(`/${nonEnterpriseDefaultVersion}`, ''))
64-
65-
// create old path /free-pro-team/github from new path /free-pro-team@latest/github
66-
oldPaths.add(oldPath
67-
.replace('@latest', ''))
68-
}
60+
// create old path /github from new path /free-pro-team@latest/github
61+
oldPaths.add(oldPath
62+
.replace(`/${nonEnterpriseDefaultVersion}`, ''))
6963

70-
// TODO THIS ONE IS TRICKY BECAUSE OF VERSIONS TO ENABLE
71-
// if (process.env.FEATURE_REMOVE_FPT) {
72-
// // create old path /free-pro-team@latest/github from new path /github
73-
// oldPaths.add(oldPath
74-
// .replace(`/${nonEnterpriseDefaultVersion}`, ''))
75-
// }
64+
// create old path /free-pro-team/github from new path /free-pro-team@latest/github
65+
oldPaths.add(oldPath
66+
.replace('@latest', ''))
7667

7768
// create old path /enterprise/<version> from new path /enterprise-server@<version>
7869
oldPaths.add(oldPath

middleware/breadcrumbs.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,7 @@ module.exports = async (req, res, next) => {
3030
}
3131

3232
// drop the version segment so pathParts now starts with /product
33-
if (!process.env.FEATURE_REMOVE_FPT) {
34-
pathParts.shift()
35-
}
36-
37-
if (process.env.FEATURE_REMOVE_FPT) {
38-
// if this is not FPT, drop the version segment so pathParts now starts with /product
39-
// if this is FPT, there is no version segment so pathParts already starts with /product
40-
if (req.context.currentVersion !== nonEnterpriseDefaultVersion) {
41-
pathParts.shift()
42-
}
43-
}
33+
pathParts.shift()
4434

4535
if (!pathParts[1]) return next()
4636

0 commit comments

Comments
 (0)