Merge remote-tracking branch 'upstream/pull/5386'

diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 67a676d87c11eea4b1879c2a715443237ea250ee..6da5e716496d05c62300b13654a44f22bbd74905 100644 (file)
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -24,10 +24,10 @@ jobs:
           bundler-cache: true
       - name: Create base branch
         run: |
-          git fetch ${{ github.event.pull_request.base.repo.clone_url }} ${{ github.event.pull_request.base.ref }}:danger_base
+          git fetch ${{ github.event.pull_request.base.repo.clone_url }} ${{ github.event.pull_request.base.sha }}:danger_base
       - name: Create head branch
         run: |
-          git fetch ${{ github.event.pull_request.head.repo.clone_url }} ${{ github.event.pull_request.head.ref }}:danger_head
+          git fetch ${{ github.event.pull_request.head.repo.clone_url }} ${{ github.event.pull_request.head.sha }}:danger_head
       - name: Danger
         env:
           DANGER_GITHUB_BEARER_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index cf63c8f8c4600ef3026ceb4f08bcf5e58e8f020b..668d050d8bbbc42da49826961dc97fcd2fd03563 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -217,6 +217,10 @@ body.small-nav {
     .search_forms {
       display: block;
     }
+
+    .username {
+      max-width: unset;
+    }
   }
 
   #sidebar .search_forms {

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index b237f8bf85e09bec86fb1fcbfc6658e765b126f6..a9b85de7dc3f68d40fa84cab7b782b0766fda9e9 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -48,8 +48,6 @@ module Api
     end
 
     def update
-      logger.debug request.raw_post
-
       relation = Relation.find(params[:id])
       new_relation = Relation.from_xml(request.raw_post)
 

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 516fb68ce407cb79fb379ec63046def5f28a0c52..5cedb3c705b5eeaeb42647057cb8de3c3cec7c8b 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -48,7 +48,7 @@ class IssuesController < ApplicationController
   end
 
   def show
-    @title = t ".title", :status => @issue.status.humanize, :issue_id => @issue.id
+    @title = t ".title.#{@issue.status}", :issue_id => @issue.id
     @read_reports = @issue.read_reports
     @unread_reports = @issue.unread_reports
     @comments = @issue.comments

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index a58b8c5cb18b4f36c4bb1c0bf978618dc08b0255..74e7c0a4ce1f7793880c542da15d021a743c1ebc 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-<h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
+<h1><%= @title %></h1>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
 <p class="text-body-secondary">
   <small>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index ff95be2f5bd648a3ca8e527bf127bd73f606d033..190ea44e5654b53b63af24f070ad8b0130609f9a 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -85,7 +85,7 @@
     </ul>
     <% if current_user && current_user.id %>
       <div class='d-inline-flex dropdown user-menu logged-in'>
-        <button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
+        <button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1 mw-100' type='button' data-bs-toggle='dropdown'>
           <%= user_thumbnail_tiny(current_user, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
           <% if current_user.new_messages.size > 0 %>
             <span class="badge count-number position-static m-1"><%= current_user.new_messages.size %></span>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 29c416c76acab7ddcbab9419c34caf14f7663f0e..c423de766639981d375023147fe282ac9e8115c8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1477,7 +1477,10 @@ en:
         open: Open
         resolved: Resolved
     show:
-      title: "%{status} Issue #%{issue_id}"
+      title:
+        open: "Open Issue #%{issue_id}"
+        ignored: "Ignored Issue #%{issue_id}"
+        resolved: "Resolved Issue #%{issue_id}"
       reports:
         one: "%{count} report"
         other: "%{count} reports"