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.

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

v2.4.0 #229

Merged
merged 62 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
0795768
WEB-6415: Add initial support for MMLP modules
KapilSachdev Aug 31, 2023
4d955fe
WEB-6415: Add initial linting support for content modules
KapilSachdev Sep 9, 2023
b72fe3d
WEB-6415: Update linting for text and lesson
KapilSachdev Sep 15, 2023
e18e9e9
WEB-6415: Upload content module to alexandria
KapilSachdev Sep 17, 2023
6f9a098
WEB-6415: Add slide and serve command
KapilSachdev Sep 18, 2023
c538cee
WEB-6415: Serve text content of modules
KapilSachdev Sep 18, 2023
269b181
WEB-6415: Remove hardcoded path
KapilSachdev Sep 18, 2023
8071033
WEB-6415: Add episode_type for content
KapilSachdev Sep 22, 2023
2cedcad
Bump actions/checkout from 3.6.0 to 4.1.0 (#214)
dependabot[bot] Sep 25, 2023
04e36d8
Bump docker/setup-buildx-action from 2.10.0 to 3.0.0 (#213)
dependabot[bot] Sep 25, 2023
f0b1145
Bump docker/build-push-action from 4.1.1 to 5.0.0 (#211)
dependabot[bot] Sep 25, 2023
e7e96ec
Bump docker/setup-qemu-action from 2.2.0 to 3.0.0 (#212)
dependabot[bot] Sep 25, 2023
e4f3f70
WEB-6415: Updating gems so that docker builds
sammyd Sep 25, 2023
e7278df
WEB-6415: Use module for content module command
KapilSachdev Sep 27, 2023
123d196
Merge pull request #208 from razeware/WEB-6415
KapilSachdev Sep 27, 2023
dd419ea
WEB-6415: Accept module secrets
KapilSachdev Sep 28, 2023
201cfcc
Merge pull request #215 from razeware/WEB-6415
KapilSachdev Sep 28, 2023
33625f5
Attempting to handle update in octokit.rb
sammyd Sep 28, 2023
ca82657
WEB-6415: Add default module file location
KapilSachdev Sep 28, 2023
28e9072
Merge pull request #216 from razeware/WEB-6415
KapilSachdev Sep 28, 2023
0ff2069
WEB-6415: Add module outcomes details
KapilSachdev Oct 2, 2023
9a04b6b
WEB-6415: Add segment type to content model wherever necessary
KapilSachdev Oct 2, 2023
5540664
WEB-6415: card_artwork_image is not needed since rebrading
KapilSachdev Oct 2, 2023
17eaf43
Merge pull request #217 from razeware/WEB-6415
KapilSachdev Oct 2, 2023
07d63d3
WEB-6415: Missing method error fix
KapilSachdev Oct 2, 2023
55a0c36
Merge pull request #218 from razeware/WEB-6415
KapilSachdev Oct 2, 2023
f3116c9
WEB-6508: Validate presence of ref in text lesson
KapilSachdev Oct 4, 2023
01750b4
Merge pull request #219 from razeware/WEB-6508
KapilSachdev Oct 4, 2023
f98949c
WEB-6519: Fixing the paths for segments in the m3 server
sammyd Oct 9, 2023
20adcf8
WEB-6519: Refactoring the slide generator to support content modules
sammyd Oct 9, 2023
325f58d
WEB-6519: Attempting to get the slide design to align with design
sammyd Oct 9, 2023
86a0fc9
Merge pull request #220 from razeware/WEB-6519
sammyd Oct 9, 2023
ccfacc5
WEB-6520: Missing description and learning objective fields from lesson
sammyd Oct 9, 2023
c87ce8a
WEB-6519: Typo in the slide generator
sammyd Oct 9, 2023
6c05cd4
Merge pull request #221 from razeware/WEB-6520
sammyd Oct 9, 2023
df4ab2a
Ci bugfizing...
sammyd Oct 9, 2023
b6bb3ff
snapshot_host should not have been overridden for CI
sammyd Oct 10, 2023
0eabe74
Incorrect variable naming
sammyd Oct 10, 2023
a8114da
Another typo
sammyd Oct 10, 2023
75ce6c8
WEB-6543: Updating linter file existence checker to work with subfiles
sammyd Oct 11, 2023
8a236a7
Merge pull request #222 from razeware/WEB-6543
sammyd Oct 11, 2023
89eb0fa
WEB-6559: Extract the vimeo_id from metadata, add to model, and push
sammyd Oct 12, 2023
fc7ff5f
Merge pull request #223 from razeware/WEB-6559
sammyd Oct 12, 2023
dfe3b14
WEB-6548: Adds a width_required attribute to ImageProvider
jellodiil Oct 12, 2023
4a3efbd
WEB-6548: We either require widths or don't
jellodiil Oct 12, 2023
eb6fb6e
WEB-6548: Checks whether we care for widths before we show an ugly error
jellodiil Oct 12, 2023
7827a97
Update app/lib/image_provider/provider.rb
jellodiil Oct 12, 2023
456e0e1
Merge pull request #224 from razeware/WEB-6548
jellodiil Oct 12, 2023
e2d21ac
WEB-6534: Make lesson ref mandatory
KapilSachdev Oct 13, 2023
3bbcd31
Merge pull request #225 from razeware/WEB-6534
KapilSachdev Oct 13, 2023
4950878
WEB-6564: Maybe complains if you have the same title?
jellodiil Oct 13, 2023
5006f15
Merge pull request #226 from razeware/WEB-6564
jellodiil Oct 13, 2023
2892266
WEB-6569: I was just being silly, we need the title of a lesson.
jellodiil Oct 13, 2023
bcbeba6
Merge pull request #227 from razeware/WEB-6569
jellodiil Oct 13, 2023
c4ef384
WEB-6578: Update dependencies
KapilSachdev Oct 15, 2023
7b2e282
Merge pull request #228 from razeware/WEB-6578
KapilSachdev Oct 16, 2023
eb5c63d
WEB-6573: Matches slide generator to carolus title slide plus changes…
jellodiil Oct 16, 2023
17e22e1
Merge pull request #230 from razeware/WEB-6573
jellodiil Oct 16, 2023
a882ce6
WEB-6573: Slide generator decided to suddenly honor the heading style…
jellodiil Oct 16, 2023
487d16e
Merge pull request #231 from razeware/WEB-6573
jellodiil Oct 16, 2023
847a9b4
WEB-6582: Missed a reference to the new width_required argument
sammyd Oct 16, 2023
8f7ff6c
Merge pull request #232 from razeware/WEB-6582
sammyd Oct 16, 2023
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
1 change: 0 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@ REPO_AWS_SECRET_ACCESS_KEY_PRODUCTION=
REPO_AWS_SECRET_ACCESS_KEY_STAGING=
REPO_SLACK_BOT_TOKEN=
REPO_SLACK_WEBHOOK_URL=

10 changes: 5 additions & 5 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.0

- name: Run tests
run: |
Expand Down Expand Up @@ -62,14 +62,14 @@ jobs:
status: STARTING
color: warning

- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.0

- name: Set up QEMU
uses: docker/setup-qemu-action@v2.2.0
uses: docker/setup-qemu-action@v3.0.0

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.10.0
uses: docker/setup-buildx-action@v3.0.0
with:
buildkitd-flags: --debug

Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
echo "::set-output name=tag_list::${TAG_LIST}"

- name: Build and push
uses: docker/build-push-action@v4.1.1
uses: docker/build-push-action@v5.0.0
with:
context: .
platforms: linux/amd64,linux/arm64
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.0

- name: Run tests
run: |
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.0
9 changes: 6 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ source 'https://rubygems.org'
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

# Stealing some bits from rails
gem 'activemodel', '~> 7.0'
gem 'activesupport', '~> 7.0'
gem 'activemodel', '< 7.2'
gem 'activesupport', '< 7.2'
# Autoloading explictly will use zeitwerk
gem 'zeitwerk', '~> 2.3'

Expand Down Expand Up @@ -32,7 +32,7 @@ gem 'aws-sdk-s3', '~> 1.64'
gem 'concurrent-ruby', '~> 1.1'

# Interacting with github
gem 'octokit', '~> 6'
gem 'octokit', '~> 7'

# Interface with libsodium
gem 'rbnacl'
Expand All @@ -45,6 +45,9 @@ gem 'sass-embedded', '~> 1.58'
gem 'sinatra', '~> 3'
gem 'thin'

# Pinning google-protobuf so that it continues to build on ARM devices
gem 'google-protobuf', '=3.22.0'

# Controlling Chrome to create snapshots
gem 'ferrum'

Expand Down
117 changes: 67 additions & 50 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,63 +14,74 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activemodel (7.0.7.1)
activesupport (= 7.0.7.1)
activesupport (7.0.7.1)
activemodel (7.1.1)
activesupport (= 7.1.1)
activesupport (7.1.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.4)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.747.0)
aws-sdk-core (3.171.0)
aws-partitions (1.835.0)
aws-sdk-core (3.185.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.63.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (1.72.0)
aws-sdk-core (~> 3, >= 3.184.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.120.1)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-s3 (1.136.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.2)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
backport (1.2.0)
base64 (0.1.1)
benchmark (0.2.1)
cli-ui (2.1.0)
bigdecimal (3.1.4)
cli-ui (2.2.3)
coderay (1.1.3)
commonmarker (0.23.10)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
daemons (1.4.1)
diff-lcs (1.5.0)
drb (2.1.1)
ruby2_keywords
e2mmap (0.1.0)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
faraday (2.7.4)
faraday (2.7.11)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday-net_http (3.0.2)
faraday-retry (2.1.0)
faraday-retry (2.2.0)
faraday (~> 2.0)
ferrum (0.13)
ferrum (0.14)
addressable (~> 2.5)
concurrent-ruby (~> 1.1)
webrick (~> 1.7)
websocket-driver (>= 0.6, < 0.8)
ffi (1.15.5)
ffi (1.16.3)
formatador (1.1.0)
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
google-protobuf (3.22.0)
guard (2.18.0)
guard (2.18.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
lumberjack (>= 1.0.12, < 2.0)
Expand All @@ -88,47 +99,50 @@ GEM
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jaro_winkler (1.5.4)
jaro_winkler (1.5.6)
jmespath (1.6.2)
json (2.6.3)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
lumberjack (1.2.8)
lumberjack (1.2.9)
method_source (1.0.0)
mini_magick (4.12.0)
mini_portile2 (2.8.1)
minitest (5.19.0)
mini_portile2 (2.8.4)
minitest (5.20.0)
multi_json (1.15.0)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
mutex_m (0.1.2)
nenv (0.3.0)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
octokit (6.1.1)
octokit (7.2.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
parallel (1.22.1)
parser (3.2.2.0)
parallel (1.23.0)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
racc (1.6.2)
rack (2.2.6.4)
public_suffix (5.0.3)
racc (1.7.1)
rack (2.2.8)
rack-livereload (0.5.1)
rack
rack-protection (3.0.6)
rack
rack-protection (3.1.0)
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
rainbow (3.1.1)
Expand All @@ -140,35 +154,37 @@ GEM
ffi
rbs (2.8.4)
rchardet (1.8.0)
regexp_parser (2.7.0)
regexp_parser (2.8.2)
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.5)
rubocop (1.50.1)
rexml (3.2.6)
rubocop (1.57.1)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.0, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.28.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
sass-embedded (1.62.0)
sass-embedded (1.62.1)
google-protobuf (~> 3.21)
rake (>= 10.0.0)
sawyer (0.9.2)
addressable (>= 2.3.5)
faraday (>= 0.17.3, < 3)
shellany (0.0.1)
sinatra (3.0.6)
sinatra (3.1.0)
mustermann (~> 3.0)
rack (~> 2.2, >= 2.2.4)
rack-protection (= 3.0.6)
rack-protection (= 3.1.0)
tilt (~> 2.0)
slack-notifier (2.4.0)
solargraph (0.49.0)
Expand All @@ -191,24 +207,24 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.2.1)
tilt (2.1.0)
thor (1.2.2)
tilt (2.3.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
webrick (1.8.1)
websocket-driver (0.7.5)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
yard (0.9.34)
zeitwerk (2.6.7)
zeitwerk (2.6.12)

PLATFORMS
ruby

DEPENDENCIES
activemodel (~> 7.0)
activesupport (~> 7.0)
activemodel (< 7.2)
activesupport (< 7.2)
aws-sdk-s3 (~> 1.64)
cli-ui (~> 2)
commonmarker
Expand All @@ -217,11 +233,12 @@ DEPENDENCIES
faraday-retry
ferrum
git
google-protobuf (= 3.22.0)
guard (~> 2, >= 2.16.2)
guard-livereload
levenshtein-ffi!
mini_magick
octokit (~> 6)
octokit (~> 7)
rack-livereload
rack-test
rbnacl
Expand All @@ -236,4 +253,4 @@ DEPENDENCIES
zeitwerk (~> 2.3)

BUNDLED WITH
2.4.7
2.4.20
Loading