Skip to content

Commit

Permalink
Bump ruby to 3.4.2 (#1241)
Browse files Browse the repository at this point in the history
* Fix updating.

* Update mill.
  • Loading branch information
epugh authored Feb 24, 2025
1 parent d059933 commit 45d944a
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: cimg/ruby:3.4.1-browsers
- image: cimg/ruby:3.4.2-browsers
environment: # environment variables for primary container
BUNDLE_JOBS: 3
BUNDLE_RETRY: 3
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.1
3.4.2
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.4.1-bullseye
FROM ruby:3.4.2-bullseye

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html

# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
ARG RUBY_VERSION=3.4.1
ARG RUBY_VERSION=3.4.2
FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base

# Rails app lives here
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

ruby '3.4.1'
ruby '3.4.2'

gem 'activerecord-import', '>= 1.0.7'
gem 'active_storage_db'
Expand Down
5 changes: 4 additions & 1 deletion app/controllers/admin/announcements_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ def create

def update
@announcement = Announcement.find(params[:id])
render 'edit'

@announcement.update(announcement_params)

render 'edit' # we stay on the edit page because that is where you can preview the rendered changes
end

def destroy
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin/announcements/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<h1>Edit Quepid Announcement</h1>
<div class="btn-toolbar mb-2 mb-md-0">
<div class="btn-group me-2">
<%= link_to 'Delete', admin_announcement_path(@announcement), method: :delete, class: 'btn btn-sm btn-outline-danger' %>
<%= button_to "Delete", admin_announcement_path(@announcement), method: :delete, class: 'btn btn-sm btn-outline-danger', onclick: "return confirm('Are you sure you want to delete this Annoucement?');" %>
<%= link_to 'Back to Quepid Announcements', admin_announcements_path, method: :get, class:'btn btn-sm btn-outline-secondary' %>
</div>
</div>
Expand Down

0 comments on commit 45d944a

Please sign in to comment.