Skip to content

Commit

Permalink
Merge branch 'dev' into implementation/59988-on-mweb-there-is-no-remi…
Browse files Browse the repository at this point in the history
…nder-set-status-shown
  • Loading branch information
akabiru committed Dec 17, 2024
2 parents dcc2235 + 65704d3 commit 0c4e8de
Show file tree
Hide file tree
Showing 288 changed files with 6,396 additions and 3,211 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ structure.sql
lefthook-local.yml
.rubocop-local.yml

/.lefthook-local/

frontend/package-lock.json

# Testing and nextcloud infrastructure
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ruby File.read(File.expand_path(".ruby-version", __dir__)).strip

gem "actionpack-xml_parser", "~> 2.0.0"
gem "activemodel-serializers-xml", "~> 1.0.1"
gem "activerecord-import", "~> 1.8.0"
gem "activerecord-import", "~> 2.0.0"
gem "activerecord-session_store", "~> 2.1.0"
gem "ox"
gem "rails", "~> 7.1.3"
Expand Down Expand Up @@ -140,7 +140,7 @@ gem "rack-attack", "~> 6.7.0"
gem "secure_headers", "~> 7.0.0"

# Browser detection for incompatibility checks
gem "browser", "~> 6.1.0"
gem "browser", "~> 6.2.0"

# Providing health checks
gem "okcomputer", "~> 1.18.1"
Expand Down Expand Up @@ -191,7 +191,7 @@ gem "puma", "~> 6.5"
gem "puma-plugin-statsd", "~> 2.0"
gem "rack-timeout", "~> 0.7.0", require: "rack/timeout/base"

gem "nokogiri", "~> 1.16.0"
gem "nokogiri", "~> 1.17.0"

gem "carrierwave", "~> 1.3.4"
gem "carrierwave_direct", "~> 2.1.0"
Expand Down Expand Up @@ -232,7 +232,7 @@ gem "factory_bot", "~> 6.5.0", require: false
# require factory_bot_rails for convenience in core development
gem "factory_bot_rails", "~> 6.4.4", require: false

gem "turbo_power", "~> 0.6.2"
gem "turbo_power", "~> 0.7.0"
gem "turbo-rails", "~> 2.0.0"

gem "httpx"
Expand Down Expand Up @@ -382,7 +382,7 @@ platforms :mri, :mingw, :x64_mingw do
end

# Support application loading when no database exists yet.
gem "activerecord-nulldb-adapter", "~> 1.0.0"
gem "activerecord-nulldb-adapter", "~> 1.1.0"

# Have application level locks on the database to have a mutex shared between workers/hosts.
# We e.g. employ this to safeguard the creation of journals.
Expand Down
66 changes: 33 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ GEM
activemodel (= 7.1.5.1)
activesupport (= 7.1.5.1)
timeout (>= 0.4.0)
activerecord-import (1.8.1)
activerecord-import (2.0.0)
activerecord (>= 4.2)
activerecord-nulldb-adapter (1.0.1)
activerecord (>= 5.2.0, < 7.2)
activerecord-nulldb-adapter (1.1.1)
activerecord (>= 6.0, < 8.1)
activerecord-session_store (2.1.0)
actionpack (>= 6.1)
activerecord (>= 6.1)
Expand Down Expand Up @@ -330,7 +330,7 @@ GEM
public_suffix (>= 2.0.2, < 7.0)
aes_key_wrap (1.1.0)
afm (0.2.2)
airbrake (13.0.4)
airbrake (13.0.5)
airbrake-ruby (~> 6.0)
airbrake-ruby (6.2.2)
rbtree3 (~> 0.6)
Expand All @@ -344,7 +344,7 @@ GEM
awesome_nested_set (3.8.0)
activerecord (>= 4.0.0, < 8.1)
aws-eventstream (1.3.0)
aws-partitions (1.1022.0)
aws-partitions (1.1023.0)
aws-sdk-core (3.214.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
Expand Down Expand Up @@ -391,7 +391,7 @@ GEM
msgpack (~> 1.2)
brakeman (6.2.2)
racc
browser (6.1.0)
browser (6.2.0)
builder (3.3.0)
byebug (11.1.3)
capybara (3.40.0)
Expand Down Expand Up @@ -441,9 +441,9 @@ GEM
bigdecimal
rexml
crass (1.0.6)
css_parser (1.19.1)
css_parser (1.21.0)
addressable
csv (3.3.0)
csv (3.3.1)
cuprite (0.15.1)
capybara (~> 3.0)
ferrum (~> 0.15.0)
Expand All @@ -467,9 +467,9 @@ GEM
representable (>= 3.1.1, < 4)
doorkeeper (5.8.1)
railties (>= 5)
dotenv (3.1.4)
dotenv-rails (3.1.4)
dotenv (= 3.1.4)
dotenv (3.1.6)
dotenv-rails (3.1.6)
dotenv (= 3.1.6)
railties (>= 6.1)
drb (2.2.1)
dry-auto_inject (1.0.1)
Expand Down Expand Up @@ -551,7 +551,7 @@ GEM
factory_bot_rails (6.4.4)
factory_bot (~> 6.5)
railties (>= 5.0.0)
faraday (2.12.1)
faraday (2.12.2)
faraday-net_http (>= 2.0, < 3.5)
json
logger
Expand Down Expand Up @@ -678,7 +678,7 @@ GEM
ice_nine (0.11.2)
interception (0.5)
io-console (0.8.0)
irb (1.14.1)
irb (1.14.2)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
iso8601 (0.13.0)
Expand Down Expand Up @@ -709,7 +709,7 @@ GEM
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
lefthook (1.9.0)
lefthook (1.9.2)
letter_opener (1.10.0)
launchy (>= 2.2, < 4)
letter_opener_web (3.0.0)
Expand All @@ -724,7 +724,7 @@ GEM
omniauth (~> 1.1)
omniauth-openid-connect (>= 0.2.1)
rails (>= 3.2.21)
logger (1.6.2)
logger (1.6.3)
lograge (0.14.0)
actionpack (>= 4)
activesupport (>= 4)
Expand Down Expand Up @@ -760,7 +760,7 @@ GEM
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1105)
mime-types-data (3.2024.1203)
mini_magick (5.0.1)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
Expand All @@ -785,10 +785,10 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
nokogiri (1.16.8)
nokogiri (1.17.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
oj (3.16.7)
oj (3.16.8)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
okcomputer (1.18.5)
Expand Down Expand Up @@ -938,7 +938,7 @@ GEM
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.1)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
rails-i18n (7.0.10)
Expand All @@ -963,13 +963,13 @@ GEM
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
rbtree3 (0.7.1)
rdoc (6.8.1)
rdoc (6.9.1)
psych (>= 4.0.0)
recaptcha (5.18.0)
redcarpet (3.6.0)
redis (5.3.0)
redis-client (>= 0.22.0)
redis-client (0.22.2)
redis-client (0.23.0)
connection_pool
regexp_parser (2.9.3)
reline (0.5.12)
Expand All @@ -984,7 +984,7 @@ GEM
actionpack (>= 5.2)
railties (>= 5.2)
retriable (3.1.2)
rexml (3.3.9)
rexml (3.4.0)
rinku (2.0.6)
roar (1.2.0)
representable (~> 3.1)
Expand Down Expand Up @@ -1012,7 +1012,7 @@ GEM
rspec-support (~> 3.13)
rspec-retry (0.6.2)
rspec-core (> 3.3)
rspec-support (3.13.1)
rspec-support (3.13.2)
rspec-wait (1.0.1)
rspec (>= 3.4)
rubocop (1.69.2)
Expand All @@ -1025,7 +1025,7 @@ GEM
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.36.2)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
Expand All @@ -1041,7 +1041,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.52.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.2.0)
rubocop-rspec (3.3.0)
rubocop (~> 1.61)
rubocop-rspec_rails (2.30.0)
rubocop (~> 1.61)
Expand All @@ -1067,7 +1067,7 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
secure_headers (7.0.0)
securerandom (0.4.0)
securerandom (0.4.1)
selenium-devtools (0.131.0)
selenium-webdriver (~> 4.2)
selenium-webdriver (4.27.0)
Expand Down Expand Up @@ -1126,7 +1126,7 @@ GEM
thor (1.3.2)
thread_safe (0.3.6)
timecop (0.9.10)
timeout (0.4.2)
timeout (0.4.3)
tpm-key_attestation (0.12.1)
bindata (~> 2.4)
openssl (> 2.0)
Expand All @@ -1136,7 +1136,7 @@ GEM
turbo-rails (2.0.11)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
turbo_power (0.6.2)
turbo_power (0.7.0)
turbo-rails (>= 1.3.0)
typed_dag (2.0.2)
rails (>= 5.0.4)
Expand Down Expand Up @@ -1204,8 +1204,8 @@ PLATFORMS
DEPENDENCIES
actionpack-xml_parser (~> 2.0.0)
activemodel-serializers-xml (~> 1.0.1)
activerecord-import (~> 1.8.0)
activerecord-nulldb-adapter (~> 1.0.0)
activerecord-import (~> 2.0.0)
activerecord-nulldb-adapter (~> 1.1.0)
activerecord-session_store (~> 2.1.0)
acts_as_list (~> 1.2.0)
acts_as_tree (~> 2.9.0)
Expand All @@ -1220,7 +1220,7 @@ DEPENDENCIES
bcrypt (~> 3.1.6)
bootsnap (~> 1.18.0)
brakeman (~> 6.2.0)
browser (~> 6.1.0)
browser (~> 6.2.0)
budgets!
capybara (~> 3.40.0)
capybara-screenshot (~> 1.0.17)
Expand Down Expand Up @@ -1291,7 +1291,7 @@ DEPENDENCIES
multi_json (~> 1.15.0)
my_page!
net-ldap (~> 0.19.0)
nokogiri (~> 1.16.0)
nokogiri (~> 1.17.0)
oj (~> 3.16.0)
okcomputer (~> 1.18.1)
omniauth!
Expand Down Expand Up @@ -1398,7 +1398,7 @@ DEPENDENCIES
timecop (~> 0.9.0)
ttfunk (~> 1.7.0)
turbo-rails (~> 2.0.0)
turbo_power (~> 0.6.2)
turbo_power (~> 0.7.0)
turbo_tests!
typed_dag (~> 2.0.2)
tzinfo-data (~> 1.2024.1)
Expand Down
8 changes: 8 additions & 0 deletions app/components/projects/life_cycle_type_component.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<%= flex_layout(align_items: :center) do |type_container|
type_container.with_column(mr: 1, classes: icon_color_class) do
render Primer::Beta::Octicon.new(icon: icon)
end
type_container.with_column do
render(Primer::Beta::Text.new(**text_options)) { text }
end
end %>
60 changes: 60 additions & 0 deletions app/components/projects/life_cycle_type_component.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# frozen_string_literal: true

# -- copyright
# OpenProject is an open source project management software.
# Copyright (C) 2010-2024 the OpenProject GmbH
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See COPYRIGHT and LICENSE files for more details.
# ++
module Projects
class LifeCycleTypeComponent < ApplicationComponent
include OpPrimer::ComponentHelpers

def text
model.model_name.human
end

def icon
case model
when Project::StageDefinition
:"git-commit"
when Project::GateDefinition
:diamond
else
raise NotImplementedError, "Unknown model #{model.class} to render a LifeCycleTypeComponent with"
end
end

def icon_color_class
helpers.hl_inline_class("life_cycle_step_definition", model)
end

def text_options
# The tag: :div is is a hack to fix the line height difference
# caused by font_size: :small. That line height difference
# would otherwise lead to the text being not on the same height as the icon
{ color: :muted, font_size: :small, tag: :div }.merge(options)
end
end
end
Loading

0 comments on commit 0c4e8de

Please sign in to comment.