Skip to content

Commit

Permalink
Merge branch 'release/6.6.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
jorg-vr committed Mar 14, 2023
2 parents 132165f + fa9926b commit 5942413
Show file tree
Hide file tree
Showing 8 changed files with 171 additions and 141 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ gem 'memory_profiler', '~> 1.0.1'
gem 'rack-mini-profiler', '~> 3.0.0'
gem 'stackprof', '~> 0.2.23'

gem 'ddtrace', '~> 1.9.0'
gem 'ddtrace', '~> 1.10.1'

# Make sure filesystem changes only happen at the end of a transaction
gem 'after_commit_everywhere', '~> 1.3.0'
Expand Down Expand Up @@ -163,7 +163,7 @@ end
group :test do
# For measuring coverage
gem 'minitest-ci', '~> 3.4.0'
gem 'simplecov', '~> 0.21.2', require: false
gem 'simplecov', '~> 0.22.0', require: false
gem 'simplecov-cobertura', '~> 2.1.0', require: false
gem 'test-prof', '~> 1.2.0'

Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@ GEM
daemons (1.4.1)
dalli (3.2.4)
date (3.3.3)
ddtrace (1.9.0)
ddtrace (1.10.1)
debase-ruby_core_source (>= 0.10.16, <= 3.2.0)
libdatadog (~> 1.0.1.1.0)
libddwaf (~> 1.5.1.0.0)
libdatadog (~> 2.0.0.1.0)
libddwaf (~> 1.6.2.0.0)
msgpack
debase-ruby_core_source (3.2.0)
delayed_job (4.1.10)
Expand Down Expand Up @@ -231,8 +231,8 @@ GEM
addressable (~> 2.7)
letter_opener (1.8.1)
launchy (>= 2.2, < 3)
libdatadog (1.0.1.1.0-x86_64-linux)
libddwaf (1.5.1.0.1-x86_64-linux)
libdatadog (2.0.0.1.0-x86_64-linux)
libddwaf (1.6.2.0.0-x86_64-linux)
ffi (~> 1.0)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
Expand Down Expand Up @@ -261,7 +261,7 @@ GEM
minitest
mocha (2.0.2)
ruby2_keywords (>= 0.0.5)
msgpack (1.6.0)
msgpack (1.6.1)
multi_json (1.15.0)
multi_xml (0.6.0)
mustermann (3.0.0)
Expand Down Expand Up @@ -424,7 +424,7 @@ GEM
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
simplecov (0.21.2)
simplecov (0.22.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
Expand Down Expand Up @@ -517,7 +517,7 @@ DEPENDENCIES
counter_culture (~> 3.2)
cssbundling-rails (~> 1.1.2)
dalli (~> 3.2.4)
ddtrace (~> 1.9.0)
ddtrace (~> 1.10.1)
delayed_job_active_record (~> 4.1.7)
delayed_job_web (~> 1.4.4)
devise (~> 4.9.0)
Expand Down Expand Up @@ -568,7 +568,7 @@ DEPENDENCIES
ruby-saml (~> 1.15.0)
rubyzip (~> 2.3.2)
selenium-webdriver (~> 4.8.1)
simplecov (~> 0.21.2)
simplecov (~> 0.22.0)
simplecov-cobertura (~> 2.1.0)
slack-notifier (~> 2.4.0)
sprockets-rails (~> 3.4.2)
Expand Down
2 changes: 0 additions & 2 deletions app/javascript/packs/application_pack.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ import { initClipboard } from "copy";
import { FaviconManager } from "favicon";
import "components/saved_annotations/saved_annotation_list";
import "components/saved_annotations/saved_annotations_sidecard";
import "components/standalone-dropdown-filter";
import "components/progress_bar";
import "components/loading_bar";

// Initialize clipboard.js
initClipboard();
Expand Down
2 changes: 2 additions & 0 deletions app/javascript/packs/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ import "components/search_token.ts";
import "components/filter_button.ts";
import "components/dropdown_filter";
import "components/filter_tabs";
import "components/standalone-dropdown-filter";
import "components/loading_bar";

window.dodona.searchQuery = searchQuery;
1 change: 1 addition & 0 deletions app/views/pages/home.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<%= content_for :javascripts do %>
<%= javascript_include_tag 'favorite_course_buttons' %>
<%= javascript_include_tag 'search' %>
<% end %>
<%= render partial: "pages/important_homepage_links" %>
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/00_version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Application
module Version
MAJOR = 6
MINOR = 6
PATCH = 6
PATCH = 7

STRING = [MAJOR, MINOR, PATCH].compact.join('.')
end
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,35 +26,35 @@
"babel-plugin-macros": "^3.1.0",
"bootstrap": "5.2.0",
"clipboard": "^2.0.11",
"core-js": "^3.29.0",
"core-js": "^3.29.1",
"d3": "^7.8.2",
"dayjs": "^1.11.7",
"dragula": "^3.7.3",
"flatpickr": "^4.6.13",
"fscreen": "^1.2.0",
"glightbox": "^3.2.0",
"iframe-resizer": "^4.3.5",
"jquery": "^3.6.3",
"iframe-resizer": "^4.3.6",
"jquery": "^3.6.4",
"lit": "2.6.1",
"node-polyglot": "^2.5.0",
"sass": "^1.58.3",
"sass": "^1.59.2",
"typescript": "^4.9.5",
"webpack": "^5.75.0",
"webpack": "^5.76.1",
"webpack-cli": "^4.9.2"
},
"devDependencies": {
"@open-wc/testing-helpers": "^2.1.4",
"@open-wc/testing-helpers": "^2.2.0",
"@testing-library/dom": "^9.0.1",
"@testing-library/user-event": "^14.4.3",
"@types/ace": "^0.0.48",
"@types/bootstrap": "^5.2.4",
"@types/dragula": "^3.7.1",
"@types/iframe-resizer": "^3.5.9",
"@types/jest": "^27.5.0",
"@types/serviceworker": "^0.0.64",
"@typescript-eslint/eslint-plugin": "^5.54.0",
"@typescript-eslint/parser": "^5.54.0",
"eslint": "^8.35.0",
"@types/serviceworker": "^0.0.65",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.54.1",
"eslint": "^8.36.0",
"eslint-config-google": "^0.14.0",
"eslint-plugin-jest": "^27.2.1",
"eslint-plugin-lit": "^1.8.2",
Expand Down
Loading

0 comments on commit 5942413

Please sign in to comment.