Continuous Release 1.8.0 #538
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Use npm audit to update npm packages * Use Node.js version 16 in Docker development also changed shell to bash We use nvm to install Node.js as nodesource distributions somehow always install Node.js 18 instead (see nodesource/distributions#1583) * Use node after installation * Split installation of Node.js to multiple RUN commands Also alias the default version If you want to see the full output during Docker build, you can use the "--progress=plain" option. * Uniy sass packages and update yarn lock * Reflect changes in production and test Dockerfiles * Add comments to Dockerfile and tighten run commands * Add sass-loader back as dependency * Switch back to old version of sass-loader This is because we still use webpacker v4 currently. We will upgrade this depenedency when we switch from @rails/webpacker to webpack in the future. * Use "-no-install-recommends" for yarn install in prod This is so that Node.js is not installed again, which would result in v18, which we don't want at the moment. * Use consistent ${} syntax in Dockerfile & fix Node path * Copy Node.js over to /usr/local This ensures that the app user can access node that was previously installed with nvm in /root/.nvm * Apply quote arguments suggestion (in code review) Co-authored-by: Christian Heusel <[email protected]> * Quote arguments in other Dockerfiles as well * Replace deprecated apt-key and improve Dockerfiles - Replaced Yarn installation with "corepack", a new binary shipped with Node.js starting with v16. This also means that Yarn is upgraded from v1 to v2 with a different CLI, e.g. we now use "yarn workspaces focus" instead of "yarn install" to install the dependencies for the workspace in the current working directory. - Update GPG key handling during PostgreSQL installation - Added some more comments to the Dockerfile - Moved copying of Node.js up in the Dockerfile More yarn-related changed in subsequent commits. * Upgrade to Yarn 2 and add packages for non-error webpack build * Copy Yarn to usr folder alongside other Node.js tooling * Activate Yarn for app user * Only copy node over to usr folder * Go back to Yarn1 and explicitly set Yarn version - Added a fix so that corepack really installs the version we want and not some other old version - with Yarn2+, building curerntly fails, so we switch back to Yarn1 and deal with an upgrade of Yarn in the future * Remove ".yarn" from .gitignore Yarn1 does not generate this folder * Remove unnecessary dependencies from package.json "unnecessary" means dependencies that were added when trying out Yarn2+ * Add back missing "--production=false" to "yarn install" * Use "ruby:3.1.4-bullseye" to have PostgreSQL available * Add missing `apt update` in dev and test Dockerfiles Co-authored-by: Christian Heusel <[email protected]> * Group `update` and `install` in one RUN statement (in prod Dockerfile) * Remove superfluous newline * Make Node.js version logging one RUN statement * Explicitly set `--production=true` during `yarn install` --------- Co-authored-by: Christian Heusel <[email protected]>
Merge main into mampf-next
"turoblinks:load" does not work well when scripts are loaded asynchronously. Therefore, we do not load the masaonry grid asynchronously anymore, see https://stackoverflow.com/a/50153681/9655481 Another problem (or the main problem) is that we've used plain HTML to init Masonry options. However, the grid is populated dynamically with Rails content. Therefore, we need to initialize it only when the page is fully loaded. For this, we use JS and the respective CSS classes on the elements. I called the class ".masonry-grid".
* add event listener for cancel lecture comments button * fix typo
…#515) * disable coloring of comments icon for comments created by user itself * avoid recreation of existing reader instances * replace touch by update method to ensure validation * adress the case of overlapping comments * fix rubocop offenses
* Uninstall old Datetimepicker * Remove old import hack for Datetimepicker * Try out Tempus Dominus datetimepicker on assignments * Show datetimepicker when clicking in text field Note that the datetimepicker is not really accessible right now. Hopefully, there will be some improvement related to this soon. See here: Eonasdan/tempus-dominus#2390 * Shrink "action" and enlargen "Deadline" column * Do not use not working jQuery version of datetimepicker * Remove autocomplete from input field * Improve accessibility of Datetimepicker (keyboard events & focus) * Add error message for invalid format & decouple from assignment view * Clean up datetimepicker.js * Change invalid date format string * Fix "is-invalid" CSS classes via JS * Get rid of old datetimepicker occurrences * Get rid of "moment" as dependency for formatting dates * Wait for document to be ready to init datetimepicker Also close the datetimepicker when a date was selected * Replace old datetimepicker in publish media modal * Fix datetimepicker in assignments view * Do not close datetimepicker when only time is changed * Improve comment * Check if date is undefined * Prevent turbolink issue with datetimepicker * Fix assignment title CSS id * Empty error message upon update of assignment * Restore old code for "assignment_title" * Use 'before-cache' instead of 'load' with Turbolinks
We will stay at v5 for the moment.
only affected the Apple Safari browser
* Upgrade Puma to v5.6.7 * Upgrade Puma to v6.3.1 * Delete stale Puma comments concerning WEB_CONCURRENCY * Reflect Puma update in lockfile
…ton) (#534) * Fix bug which causes the "new comment" button on the show_comment page to have no effect, if pressed multiple times. The reason for this is that the variables popoverTriggerList and popoverList (in the file that is being changed for this commit) are declared as constants. Clicking the button a second time causes the script to run again such that the variables will be defined a second time. * Decaffeinate modal fix & outsource popover handling * Remove popover handling from new comment handler * Rename bootstrap popover initialization function Also removed unnecessary console log * Outsource bootstrap popover initialization * Add initialization of popovers back to new comments * Remove superfluous coffeescript comment * Add missing popover initializations * Fix unwanted search/replace --------- Co-authored-by: Splines <[email protected]>
* Restyle admin navbar & small changes to normal navbar * Replace yellow background with grid pattern * Fix alignment of "quick access" * Make CSS selector more specific This is so that it overwrites Bootstrap defaults. * Move nav-item related CSS to navbar CSS file * Nest navbar-related CSS * Fix admin-button highlight color * Add missing icon * Add dot to indicate current active navbar item * Remove unnecessary newline
This comment was marked as off-topic.
This comment was marked as off-topic.
* Update Bootstrap to v5.3.1 * Replace `text-muted` with `text-body-secondary` as indicated in the docs: https://getbootstrap.com/docs/5.3/migration/#utilities-1
Fixed conflicts in package.json and yarn.lock (due to removal of jquery datetimepicker and moment.js library).
fosterfarrell9
approved these changes
Oct 16, 2023
Splines
added a commit
that referenced
this pull request
Oct 22, 2023
This is just to bring back a merge commit from `main` to `mampf-next`. Will try to do a rebase from `mampf-next` onto `main` next time to avoid these kind of PRs and merge commits.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Changes for future versions
Rejected