Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
ee43e924
Commit
ee43e924
authored
Jan 21, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add warning if user own projet but not in team. Also show loading when merge MR
parent
d1e63c7d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
1 deletion
+10
-1
CHANGELOG
CHANGELOG
+1
-1
app/assets/javascripts/merge_requests.js.coffee
app/assets/javascripts/merge_requests.js.coffee
+4
-0
app/views/layouts/project_resource.html.haml
app/views/layouts/project_resource.html.haml
+3
-0
app/views/shared/_not_in_team.html.haml
app/views/shared/_not_in_team.html.haml
+2
-0
No files found.
CHANGELOG
View file @
ee43e924
...
@@ -18,7 +18,7 @@ v 4.1.0
...
@@ -18,7 +18,7 @@ v 4.1.0
- added new classes Team, Repository
- added new classes Team, Repository
- Reduce amount of gitolite calls
- Reduce amount of gitolite calls
- Ability to add user in all group projects
- Ability to add user in all group projects
- remove derecated configs
- remove de
p
recated configs
- replaced Korolev font with open font
- replaced Korolev font with open font
- restyled admin/dashboard page
- restyled admin/dashboard page
- restyled admin/projects page
- restyled admin/projects page
...
...
app/assets/javascripts/merge_requests.js.coffee
View file @
ee43e924
...
@@ -51,6 +51,10 @@ class MergeRequest
...
@@ -51,6 +51,10 @@ class MergeRequest
this
.
$
(
'.nav-tabs'
).
on
'click'
,
'li'
,
(
event
)
=>
this
.
$
(
'.nav-tabs'
).
on
'click'
,
'li'
,
(
event
)
=>
this
.
activateTab
(
$
(
event
.
currentTarget
).
data
(
'action'
))
this
.
activateTab
(
$
(
event
.
currentTarget
).
data
(
'action'
))
this
.
$
(
'.accept_merge_request'
).
on
'click'
,
->
$
(
'.automerge_widget.can_be_merged'
).
hide
()
$
(
'.merge-in-progress'
).
show
()
activateTab
:
(
action
)
->
activateTab
:
(
action
)
->
this
.
$
(
'.nav-tabs li'
).
removeClass
'active'
this
.
$
(
'.nav-tabs li'
).
removeClass
'active'
this
.
$
(
'.tab-content'
).
hide
()
this
.
$
(
'.tab-content'
).
hide
()
...
...
app/views/layouts/project_resource.html.haml
View file @
ee43e924
...
@@ -6,6 +6,9 @@
...
@@ -6,6 +6,9 @@
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
=
render
"layouts/head_panel"
,
title:
project_title
(
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
=
render
'shared/no_ssh'
-
unless
@project
.
users
.
include?
(
current_user
)
=
render
'shared/not_in_team'
.container
.container
%ul
.main_menu
%ul
.main_menu
=
nav_link
(
html_options:
{
class:
"home
#{
project_tab_class
}
"
})
do
=
nav_link
(
html_options:
{
class:
"home
#{
project_tab_class
}
"
})
do
...
...
app/views/shared/_not_in_team.html.haml
0 → 100644
View file @
ee43e924
%p
.error_message.centered
You won't be able to use git over ssh until you join project on
#{
link_to
'team page'
,
project_team_index_path
(
@project
)
}
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