Merge remote-tracking branch 'origin/release/13.0' into dev

opf · Sep 8, 2023 · bfcdd3f · bfcdd3f
2 parents 39bac39 + 8de7b10
commit bfcdd3f
Show file tree

Hide file tree

Showing 13 changed files with 598 additions and 95 deletions.
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
@@ -36,7 +36,7 @@ See COPYRIGHT and LICENSE files for more details.
 </div>
 
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
-<%= render partial: 'dir_list' %>
+  <%= render partial: 'dir_list' %>
 <% end %>
 
 <%= render_properties(@properties) %>
@@ -50,8 +50,11 @@ See COPYRIGHT and LICENSE files for more details.
                },
                method: :get,
                id: 'revision_selector',
-               class: 'form -vertical'
-              ) do %>
+               class: 'form -vertical',
+               data: {
+                 'repository-navigation-target': 'form',
+               }
+      ) do %>
     <li class="toolbar-item toolbar-input-group hidden-for-mobile">
       <div>
         <%= label_tag 'rev', I18n.t('repositories.go_to_revision') %>
@@ -66,34 +69,36 @@ See COPYRIGHT and LICENSE files for more details.
                          } %>
     </li>
     <% if !@repository.branches.nil? && @repository.branches.length > 0 %>
-    <li class="toolbar-item toolbar-input-group hidden-for-mobile">
-      <div>
-        <%= label_tag 'branch', I18n.t(:label_branch) %>
-      </div>
-      <%= select_tag :branch,
-                     options_for_select(@repository.branches, @rev),
-                     include_blank: "--- #{t(:actionview_instancetag_blank_option)} ---",
-                     id: 'revision-branch-select',
-                     data: {
-                       'repository-navigation-target': 'branch'
-                     }
-      %>
-    </li>
+      <li class="toolbar-item toolbar-input-group hidden-for-mobile">
+        <div>
+          <%= label_tag 'branch', I18n.t(:label_branch) %>
+        </div>
+        <%= select_tag :branch,
+                       options_for_select(@repository.branches, @rev),
+                       include_blank: "--- #{t(:actionview_instancetag_blank_option)} ---",
+                       id: 'revision-branch-select',
+                       data: {
+                         'repository-navigation-target': 'branch',
+                         action: 'repository-navigation#applyValue'
+                       }
+        %>
+      </li>
     <% end %>
     <% if !@repository.tags.nil? && @repository.tags.length > 0 %>
-    <li class="toolbar-item toolbar-input-group hidden-for-mobile">
-      <div>
-        <%= label_tag 'tag', I18n.t(:label_tag) %>
-      </div>
-      <%= select_tag :tag,
-                     options_for_select(@repository.tags, @rev),
-                     include_blank: "--- #{t(:actionview_instancetag_blank_option)} ---",
-                     id: 'revision-tag-select',
-                     data: {
-                       'repository-navigation-target': 'tag'
-                     }
-      %>
-    </li>
+      <li class="toolbar-item toolbar-input-group hidden-for-mobile">
+        <div>
+          <%= label_tag 'tag', I18n.t(:label_tag) %>
+        </div>
+        <%= select_tag :tag,
+                       options_for_select(@repository.tags, @rev),
+                       include_blank: "--- #{t(:actionview_instancetag_blank_option)} ---",
+                       id: 'revision-tag-select',
+                       data: {
+                         'repository-navigation-target': 'tag',
+                         action: 'repository-navigation#applyValue'
+                       }
+        %>
+      </li>
     <% end %>
     <li class="toolbar-item -icon-only">
       <%= link_to({ url: { action: 'revision#revision-identifier-inputs', project_id: @project,
@@ -106,22 +111,22 @@ See COPYRIGHT and LICENSE files for more details.
 <% end %>
 
 <% if authorize_for('repositories', 'revisions') %>
-<%   if @changesets && !@changesets.empty? %>
-<%=    render partial: 'revisions',
-              locals: {project: @project, path: @path,
-                          revisions: @changesets, entry: nil }%>
-<%   end %>
-<p>
-<%
-     has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
-     sep = ''
- %>
+  <% if @changesets && !@changesets.empty? %>
+    <%= render partial: 'revisions',
+               locals: { project: @project, path: @path,
+                         revisions: @changesets, entry: nil } %>
+  <% end %>
+  <p>
+    <%
+      has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
+      sep = ''
+    %>
 
-<%   if @repository.supports_all_revisions? && @path.blank? %>
-<%= link_to t(:label_view_all_revisions), revisions_project_repository_path(@project) %>
-<%   sep = '|' %>
-<%   end %>
-</p>
+    <% if @repository.supports_all_revisions? && @path.blank? %>
+      <%= link_to t(:label_view_all_revisions), revisions_project_repository_path(@project) %>
+      <% sep = '|' %>
+    <% end %>
+  </p>
 <% end %>
 
 <% html_title(t(:label_repository)) -%>