Commit ee43e924 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Add warning if user own projet but not in team. Also show loading when merge MR

parent d1e63c7d
......@@ -18,7 +18,7 @@ v 4.1.0
- added new classes Team, Repository
- Reduce amount of gitolite calls
- Ability to add user in all group projects
- remove derecated configs
- remove deprecated configs
- replaced Korolev font with open font
- restyled admin/dashboard page
- restyled admin/projects page
......@@ -51,6 +51,10 @@ class MergeRequest
this.$('.nav-tabs').on 'click', 'li', (event) =>
this.$('.accept_merge_request').on 'click', ->
activateTab: (action) ->
this.$('.nav-tabs li').removeClass 'active'
......@@ -6,6 +6,9 @@
= render "layouts/head_panel", title: project_title(@project)
- if can?(current_user, :download_code, @project)
= render 'shared/no_ssh'
- unless @project.users.include?(current_user)
= render 'shared/not_in_team'
= nav_link(html_options: {class: "home #{project_tab_class}"}) do
You won't be able to use git over ssh until you join project on #{link_to 'team page', project_team_index_path(@project)}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment