Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
1 merge request!1491Omniauth adjustments for Shibboleth integration.
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -51,6 +51,10 @@ class MergeRequest
this.$('.nav-tabs').on 'click', 'li', (event) =>
this.activateTab($(event.currentTarget).data('action'))
 
this.$('.accept_merge_request').on 'click', ->
$('.automerge_widget.can_be_merged').hide()
$('.merge-in-progress').show()
activateTab: (action) ->
this.$('.nav-tabs li').removeClass 'active'
this.$('.tab-content').hide()
Loading
Loading
Loading
Loading
@@ -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'
.container
%ul.main_menu
= nav_link(html_options: {class: "home #{project_tab_class}"}) do
Loading
Loading
%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)}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment