Merge pull request #9686 from fjordllc/main

Release 2026-02-27 07:06:51 +0000

Author: komagata

Gemfile.lock

@@ -444,11 +444,11 @@ GEM
     netrc (0.11.0)
     newspaper (0.2.0)
     nio4r (2.7.5)
-    nokogiri (1.19.0-arm64-darwin)
+    nokogiri (1.19.1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-darwin)
+    nokogiri (1.19.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.0-x86_64-linux-gnu)
+    nokogiri (1.19.1-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (1.1.3)
       base64 (~> 0.1)
@@ -518,7 +518,7 @@ GEM
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.2.4)
+    rack (3.2.5)
     rack-cors (3.0.0)
       logger
       rack (>= 3.0.14)

app/helpers/application_helper.rb

@@ -7,12 +7,7 @@ def my_practice?(practice)
     [:everyone, current_user.job].include?(practice.target)
   end
 
-  # development/test環境では常に有効、それ以外はフィーチャーフラグで制御
-  def smart_search_available?
-    Rails.env.local? || Switchlet.enabled?(:smart_search)
-  end
-
   def movie_available?
-    Rails.env.local? || Switchlet.enabled?(:movie)
+    Rails.env.local? || current_user&.admin? || Switchlet.enabled?(:movie)
   end
 end

app/views/application/_global_nav.slim

@@ -50,10 +50,10 @@ nav.global-nav
             .global-nav-links__link-icon
               i.fa-solid.fa-file
             .global-nav-links__link-label
-              - if Rails.env.production?
-                | Docs
-              - else
+              - if movie_available?
                 | Docs・動画
+              - else
+                | Docs
         li.global-nav-links__item
           = link_to portfolios_path, class: "global-nav-links__link #{current_link(/^works/)}" do
             .global-nav-links__link-icon

app/views/application/header/_header_search.html.slim

@@ -6,17 +6,16 @@
           | カテゴリー
         .a-button.is-md.is-secondary.is-select.is-block
           = select_tag 'document_type', options_for_select(Searcher::Configuration.available_types_for_select, params[:document_type]), id: select_id
-      - if smart_search_available?
-        .form-item
-          label.a-form-label
-            | 検索方法
-          ul.block-checks.is-vertical
-            - Searcher::MODES_FOR_SELECT.each do |label, value|
-              li.block-checks__item
-                .a-block-check.is-radio
-                  = radio_button_tag 'mode', value, (params[:mode] || 'keyword') == value, id: "#{mode_id_prefix}-#{value}", class: 'a-toggle-checkbox'
-                  label.a-block-check__label(for="#{mode_id_prefix}-#{value}")
-                    = label
+      .form-item
+        label.a-form-label
+          | 検索方法
+        ul.block-checks.is-vertical
+          - Searcher::MODES_FOR_SELECT.each do |label, value|
+            li.block-checks__item
+              .a-block-check.is-radio
+                = radio_button_tag 'mode', value, (params[:mode] || 'keyword') == value, id: "#{mode_id_prefix}-#{value}", class: 'a-toggle-checkbox'
+                label.a-block-check__label(for="#{mode_id_prefix}-#{value}")
+                  = label
       .form-item
         label.a-form-label
           | 絞り込み条件

package-lock.json

@@ -37,7 +37,7 @@
     "hotkeys-js": "^3.3.5",
     "jp-postal": "^3.2.0",
     "js-yaml": "^3.13.1",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.23",
     "lodash.template": "^4.5.0",
     "markdown-it": "^13.0.2",
     "markdown-it-anchor": "^8.6.7",