BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
97d7c06f
Unverified
Commit
97d7c06f
authored
Dec 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix scroll problems and disable authorized_only filter
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7b792af8
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
10 deletions
+15
-10
layout.scss
app/assets/stylesheets/main/layout.scss
+0
-4
sidebar.scss
app/assets/stylesheets/sections/sidebar.scss
+0
-1
application_controller.rb
app/controllers/application_controller.rb
+5
-1
merge_requests.rb
features/steps/dashboard/merge_requests.rb
+10
-4
No files found.
app/assets/stylesheets/main/layout.scss
View file @
97d7c06f
...
...
@@ -4,10 +4,6 @@ html {
&
.touch
.tooltip
{
display
:
none
!
important
;
}
}
body
{
padding-bottom
:
20px
;
}
.container
{
padding-top
:
0
;
z-index
:
5
;
...
...
app/assets/stylesheets/sections/sidebar.scss
View file @
97d7c06f
...
...
@@ -3,7 +3,6 @@
}
.sidebar-wrapper
{
z-index
:
1000
;
overflow-y
:
auto
;
background
:
#F5F5F5
;
}
...
...
app/controllers/application_controller.rb
View file @
97d7c06f
...
...
@@ -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
...
...
features/steps/dashboard/merge_requests.rb
View file @
97d7c06f
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment