diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-14 18:28:42 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-14 18:28:42 +0300 |
| commit | b35d5a6a16d3ce390f21459e2989e8c41bce3150 (patch) | |
| tree | 8639479bf5f05d7605b9e4de85e50adbd3897a81 /app/controllers | |
| parent | c0c314c6bfe3640d724955d7d4eae7b9f7e1d2b1 (diff) | |
| parent | 3e97de838c6a2a37e1daa5ab8c3cd1fa350b1a7e (diff) | |
Merge branch 'public_profiles' into 'master'
Make all group public
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#
Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361
See merge request !1247
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/namespaces_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 486c6b2819c..524218290c6 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -4,7 +4,7 @@ class GroupsController < Groups::ApplicationController before_action :group, except: [:new, :create] # Authorize - before_action :authorize_read_group!, except: [:new, :create] + before_action :authorize_read_group!, except: [:show, :new, :create] before_action :authorize_admin_group!, only: [:edit, :update, :destroy, :projects] before_action :authorize_create_group!, only: [:new, :create] diff --git a/app/controllers/namespaces_controller.rb b/app/controllers/namespaces_controller.rb index 83eec1bf4a2..282012c60a1 100644 --- a/app/controllers/namespaces_controller.rb +++ b/app/controllers/namespaces_controller.rb @@ -14,7 +14,7 @@ class NamespacesController < ApplicationController if user redirect_to user_path(user) - elsif group && can?(current_user, :read_group, group) + elsif group redirect_to group_path(group) elsif current_user.nil? authenticate_user! |