diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-20 15:37:37 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-20 15:37:37 +0100 |
| commit | 218283b368161130f43333e75629870c9649b319 (patch) | |
| tree | c266f2c98aa3b199569a482fc0a651c484dd486f /app/controllers/projects_controller.rb | |
| parent | 4ef6ffaad3e9b7a29b438722e5e101de78521ec7 (diff) | |
| parent | 65b125a5035cb021aeb81e168fd4ae1ad6c74c11 (diff) | |
| download | gitlab-ce-218283b368161130f43333e75629870c9649b319.tar.gz | |
Merge branch 'extend_markdown_upload' into generic-uploads
# Conflicts:
# app/controllers/files_controller.rb
# app/controllers/projects/uploads_controller.rb
# app/uploaders/attachment_uploader.rb
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b0fde88babc..74e188e484d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -137,18 +137,6 @@ class ProjectsController < ApplicationController end end - def upload_image - link_to_image = ::Projects::ImageService.new(repository, params, root_url).execute - - respond_to do |format| - if link_to_image - format.json { render json: { link: link_to_image } } - else - format.json { render json: 'Invalid file.', status: :unprocessable_entity } - end - end - end - def toggle_star current_user.toggle_star(@project) @project.reload @@ -161,15 +149,6 @@ class ProjectsController < ApplicationController private - def upload_path - base_dir = FileUploader.generate_dir - File.join(repository.path_with_namespace, base_dir) - end - - def accepted_images - %w(png jpg jpeg gif) - end - def set_title @title = 'New Project' end |