Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/pages/issuable.scss

@@ -60,6 +60,10 @@
     padding: 0;
     margin-bottom: $gl-padding;
     border-bottom: 0;
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    min-width: 0;
+    width: 100%;
   }
 
   .btn-edit {

changelogs/unreleased/55484-fix-edit-button.yml

+title: Fix edit button disappearing in issue title
+merge_request: 23948
+author: Ruben Moya
+type: fixed

db/fixtures/development/24_forks.rb

@@ -4,6 +4,12 @@ Sidekiq::Testing.inline! do
   Gitlab::Seeder.quiet do
     User.all.sample(10).each do |user|
       source_project = Project.public_only.sample
+
+      ##
+      # 04_project.rb might not have created a public project because
+      # we use randomized approach (e.g. `Array#sample`).
+      return unless source_project
+
       fork_project = Projects::ForkService.new(source_project, user, namespace: user.namespace).execute
 
       if fork_project.valid?

qa/qa/page/base.rb

@@ -80,8 +80,8 @@ module QA
         page.evaluate_script('xhr.status') == 200
       end
 
-      def find_element(name, wait: Capybara.default_max_wait_time)
-        find(element_selector_css(name), wait: wait)
+      def find_element(name, text_filter = nil, wait: Capybara.default_max_wait_time)
+        find(element_selector_css(name), wait: wait, text: text_filter)
       end
 
       def all_elements(name)

qa/qa/page/project/issue/show.rb

@@ -37,17 +37,17 @@ module QA
 
           def select_comments_only_filter
             click_element :discussion_filter
-            all_elements(:filter_options)[1].click
+            find_element(:filter_options, "Show comments only").click
           end
 
           def select_history_only_filter
             click_element :discussion_filter
-            all_elements(:filter_options).last.click
+            find_element(:filter_options, "Show history only").click
           end
 
           def select_all_activities_filter
             click_element :discussion_filter
-            all_elements(:filter_options).first.click
+            find_element(:filter_options, "Show all activity").click
           end
         end
       end