Permalink
Browse files

Add warning if user own projet but not in team. Also show loading whe…

…n merge MR
  • Loading branch information...
1 parent d1e63c7 commit ee43e9248ce54761e8c8df17459d5aa5911ead89 @randx randx committed Jan 21, 2013
View
2 CHANGELOG
@@ -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
View
4 app/assets/javascripts/merge_requests.js.coffee
@@ -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()
View
3 app/views/layouts/project_resource.html.haml
@@ -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
View
2 app/views/shared/_not_in_team.html.haml
@@ -0,0 +1,2 @@
+%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 comments on commit ee43e92

Please sign in to comment.