-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release/14.6' into dev
- Loading branch information
Showing
11 changed files
with
78 additions
and
75 deletions.
There are no files selected for viewing
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM ruby:3.3.4-bullseye as develop | ||
FROM ruby:3.3.4-bullseye AS develop | ||
MAINTAINER [email protected] | ||
|
||
ARG DEV_UID=1000 | ||
|
@@ -67,7 +67,7 @@ RUN gem install bundler --version "${BUNDLER_VERSION}" --no-document | |
|
||
####### Testing image below ######### | ||
|
||
FROM develop as test | ||
FROM develop AS test | ||
|
||
USER root | ||
|
||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
ARG RUBY_VERSION="3.3.4" | ||
FROM ruby:${RUBY_VERSION}-bookworm as base | ||
FROM ruby:${RUBY_VERSION}-bookworm AS base | ||
LABEL maintainer="[email protected]" | ||
|
||
ARG BUNDLER_VERSION="2.5.13" | ||
|
@@ -80,7 +80,7 @@ RUN cp Gemfile.lock.bak Gemfile.lock && rm Gemfile.lock.bak && \ | |
# ------------------------------------- | ||
# slim (public) | ||
# ------------------------------------- | ||
FROM base as slim | ||
FROM base AS slim | ||
|
||
USER $APP_USER | ||
EXPOSE 8080 | ||
|
@@ -91,7 +91,7 @@ VOLUME ["$APP_DATA_PATH"] | |
# ------------------------------------- | ||
# all-in-one (public) | ||
# ------------------------------------- | ||
FROM base as all-in-one | ||
FROM base AS all-in-one | ||
|
||
ENV OPENPROJECT_RAILS__CACHE__STORE=memcache | ||
ENV DATABASE_URL=postgres://openproject:[email protected]/openproject | ||
|
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
55 changes: 20 additions & 35 deletions
55
modules/avatars/app/views/settings/_openproject_avatars.html.erb
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,24 @@ | ||
<% manager = ::OpenProject::Avatars::AvatarManager %> | ||
|
||
<%= | ||
render(Primer::OpenProject::PageHeader.new) do |header| | ||
header.with_title { I18n.t(:label_avatar_plural) } | ||
header.with_breadcrumbs([{ href: admin_index_path, text: t("label_administration") }, | ||
{ href: admin_settings_users_path, text: t(:label_user_and_permission) }, | ||
I18n.t(:label_avatar_plural)]) | ||
end | ||
%> | ||
<fieldset class="form--fieldset"> | ||
<legend class="form--fieldset-legend" title="<%= t 'avatars.label_gravatar' %>"><%= t 'avatars.label_gravatar' %></legend> | ||
|
||
<div id="settings"> | ||
<%= styled_form_tag({controller: '/admin/settings', action: 'update_plugin' }) do %> | ||
<fieldset class="form--fieldset"> | ||
<legend class="form--fieldset-legend" title="<%= t 'avatars.label_gravatar' %>"><%= t 'avatars.label_gravatar' %></legend> | ||
<div class="form--field"> | ||
<%= styled_label_tag 'settings-enable-gravatars', t('avatars.settings.enable_gravatars') %> | ||
<%= hidden_field_tag 'settings[enable_gravatars]', 0 %> | ||
<div class="form--field-container"> | ||
<%= styled_check_box_tag 'settings[enable_gravatars]', 1, manager.gravatar_enabled?, container_class: '-xslim', id: 'settings-enable-gravatars' %> | ||
</div> | ||
</div> | ||
</fieldset> | ||
|
||
<div class="form--field"> | ||
<%= styled_label_tag 'settings-enable-gravatars', t('avatars.settings.enable_gravatars') %> | ||
<%= hidden_field_tag 'settings[enable_gravatars]', 0 %> | ||
<div class="form--field-container"> | ||
<%= styled_check_box_tag 'settings[enable_gravatars]', 1, manager.gravatar_enabled?, container_class: '-xslim', id: 'settings-enable-gravatars' %> | ||
</div> | ||
</div> | ||
</fieldset> | ||
|
||
<fieldset class="form--fieldset"> | ||
<legend class="form--fieldset-legend" title="<%= t 'avatars.label_local_avatar' %>"><%= t 'avatars.label_local_avatar' %></legend> | ||
<div class="form--field"> | ||
<%= styled_label_tag 'settings-enable-local-avatars', t('avatars.settings.enable_local_avatars') %> | ||
<%= hidden_field_tag 'settings[enable_local_avatars]', 0 %> | ||
<div class="form--field-container"> | ||
<%= styled_check_box_tag 'settings[enable_local_avatars]', 1, manager.local_avatars_enabled?, container_class: '-xslim', id: 'settings-enable-local-avatars' %> | ||
</div> | ||
</div> | ||
</fieldset> | ||
|
||
<%= styled_submit_tag t(:button_apply), class: '-primary' %> | ||
<% end %> | ||
</div> | ||
<fieldset class="form--fieldset"> | ||
<legend class="form--fieldset-legend" title="<%= t 'avatars.label_local_avatar' %>"><%= t 'avatars.label_local_avatar' %></legend> | ||
<div class="form--field"> | ||
<%= styled_label_tag 'settings-enable-local-avatars', t('avatars.settings.enable_local_avatars') %> | ||
<%= hidden_field_tag 'settings[enable_local_avatars]', 0 %> | ||
<div class="form--field-container"> | ||
<%= styled_check_box_tag 'settings[enable_local_avatars]', 1, manager.local_avatars_enabled?, container_class: '-xslim', id: 'settings-enable-local-avatars' %> | ||
</div> | ||
</div> | ||
</fieldset> |
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
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
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