Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
dc2f808f
Commit
dc2f808f
authored
7 years ago
by
edx-pipeline-bot
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #15797 from edx/release-mergeback-to-master
Merge release back to master
parents
e14cad45
d91f9f94
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cms/envs/bok_choy.py
+4
-0
4 additions, 0 deletions
cms/envs/bok_choy.py
cms/envs/common.py
+3
-2
3 additions, 2 deletions
cms/envs/common.py
with
7 additions
and
2 deletions
cms/envs/bok_choy.py
+
4
−
0
View file @
dc2f808f
...
...
@@ -101,6 +101,10 @@ FEATURES['ENABLE_VIDEO_BUMPER'] = True # Enable video bumper in Studio settings
FEATURES
[
'
ENABLE_ENROLLMENT_TRACK_USER_PARTITION
'
]
=
True
# Whether archived courses (courses with end dates in the past) should be
# shown in Studio in a separate list.
FEATURES
[
'
ENABLE_SEPARATE_ARCHIVED_COURSES
'
]
=
True
# Enable support for OpenBadges accomplishments
FEATURES
[
'
ENABLE_OPENBADGES
'
]
=
True
...
...
This diff is collapsed.
Click to expand it.
cms/envs/common.py
+
3
−
2
View file @
dc2f808f
...
...
@@ -254,8 +254,9 @@ FEATURES = {
'
ENABLE_ENROLLMENT_TRACK_USER_PARTITION
'
:
True
,
# Whether archived courses (courses with end dates in the past) should be
# shown in Studio in a separate list.
'
ENABLE_SEPARATE_ARCHIVED_COURSES
'
:
True
# shown in Studio in a separate list. Note that attempting to enable this
# failed on stage-- see EDUCATOR-1134.
'
ENABLE_SEPARATE_ARCHIVED_COURSES
'
:
False
}
ENABLE_JASMINE
=
False
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment