From 97d7c06f781f17a21689cf35410009f1247427e9 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 24 Dec 2014 12:56:03 +0200
Subject: [PATCH] Fix scroll problems and disable authorized_only filter

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/main/layout.scss      |  4 ----
 app/assets/stylesheets/sections/sidebar.scss |  1 -
 app/controllers/application_controller.rb    |  6 +++++-
 features/steps/dashboard/merge_requests.rb   | 14 ++++++++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/main/layout.scss b/app/assets/stylesheets/main/layout.scss
index 2800feb81f2..71522443f10 100644
--- a/app/assets/stylesheets/main/layout.scss
+++ b/app/assets/stylesheets/main/layout.scss
@@ -4,10 +4,6 @@ html {
   &.touch .tooltip { display: none !important; }
 }
 
-body {
-  padding-bottom: 20px;
-}
-
 .container {
   padding-top: 0;
   z-index: 5;
diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss
index f3b2167bc6e..80b49d751b9 100644
--- a/app/assets/stylesheets/sections/sidebar.scss
+++ b/app/assets/stylesheets/sections/sidebar.scss
@@ -3,7 +3,6 @@
 }
 
 .sidebar-wrapper {
-  z-index: 1000;
   overflow-y: auto;
   background: #F5F5F5;
 }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1b48572f2b8..41ad5f98ace 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -252,7 +252,11 @@ class ApplicationController < ActionController::Base
     elsif @group
       @filter_params[:group_id] = @group.id
     else
-      @filter_params[:authorized_only] = true
+      # TODO: this filter ignore issues/mr created in public or
+      # internal repos where you are not a member. Enable this filter
+      # or improve current implementation to filter only issues you
+      # created or assigned or mentioned
+      #@filter_params[:authorized_only] = true
 
       unless @filter_params[:assignee_id]
         @filter_params[:assignee_id] = current_user.id
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
index 75e53173d3f..6261c89924c 100644
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
@@ -39,14 +39,20 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click "Authored by me" link' do
-    within ".scope-filter" do
-      click_link 'Created by me'
+    within ".assignee-filter" do
+      click_link "Any"
+    end
+    within ".author-filter" do
+      click_link current_user.name
     end
   end
 
   step 'I click "All" link' do
-    within ".scope-filter" do
-      click_link "Everyone's"
+    within ".author-filter" do
+      click_link "Any"
+    end
+    within ".assignee-filter" do
+      click_link "Any"
     end
   end