diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-21 17:05:18 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-21 17:05:18 +0400 |
| commit | ee43e9248ce54761e8c8df17459d5aa5911ead89 (patch) | |
| tree | b1fe3e784c6afcf82f71eafcf2e1143730f4c6fd | |
| parent | d1e63c7df285740db9672ba023383c83b83fd03b (diff) | |
Add warning if user own projet but not in team. Also show loading when merge MR
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_requests.js.coffee | 4 | ||||
| -rw-r--r-- | app/views/layouts/project_resource.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/_not_in_team.html.haml | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index afb06aa259e..2d05a51e77d 100644 --- a/CHANGELOG +++ b/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 diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee index cdc685f2c09..9c9cc6132b3 100644 --- a/app/assets/javascripts/merge_requests.js.coffee +++ b/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() diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml index e00f96a7723..14671c5ca70 100644 --- a/app/views/layouts/project_resource.html.haml +++ b/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 diff --git a/app/views/shared/_not_in_team.html.haml b/app/views/shared/_not_in_team.html.haml new file mode 100644 index 00000000000..0d003bde953 --- /dev/null +++ b/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)} |