diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-02-21 22:55:28 +0300 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-02-21 22:55:28 +0300 |
| commit | 2a9eed6620fd57c2a82edf5eab95dade3da250d3 (patch) | |
| tree | d4c33eaaae008510086b0476db9bd4ae32dc298e /app/controllers/projects/repositories_controller.rb | |
| parent | 83e2a1ca12372279cf7948b4d4b3e8a11c50e428 (diff) | |
| parent | 71e146999c405ab301cd3c3e3aa03b89d46c461e (diff) | |
Merge branch 'master' into rails-4.1.9
Conflicts:
app/views/projects/commits/_commit.html.haml
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue_context.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/show/_context.html.haml
Diffstat (limited to 'app/controllers/projects/repositories_controller.rb')
| -rw-r--r-- | app/controllers/projects/repositories_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/repositories_controller.rb b/app/controllers/projects/repositories_controller.rb index 8a997370dd7..245dfb7bb9a 100644 --- a/app/controllers/projects/repositories_controller.rb +++ b/app/controllers/projects/repositories_controller.rb @@ -1,7 +1,7 @@ class Projects::RepositoriesController < Projects::ApplicationController # Authorize - before_filter :authorize_download_code! before_filter :require_non_empty_project, except: :create + before_filter :authorize_download_code! before_filter :authorize_admin_project!, only: :create def create |