diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-22 20:04:54 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-22 20:04:54 +0100 |
| commit | b3f27aed775232200533a4df2a6e7cc70be13574 (patch) | |
| tree | 2d998e4677f8bd81077f4b8ce70c2479d376510e /app/controllers | |
| parent | f8c044bad3266ee4d31b9606024f4572d1fac3bd (diff) | |
| parent | 46be07d2c1da93cffd59fb03036e357c04ff6f3b (diff) | |
| download | gitlab-ce-b3f27aed775232200533a4df2a6e7cc70be13574.tar.gz | |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/ide_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/controllers/ide_controller.rb b/app/controllers/ide_controller.rb new file mode 100644 index 00000000000..1ff25a45398 --- /dev/null +++ b/app/controllers/ide_controller.rb @@ -0,0 +1,6 @@ +class IdeController < ApplicationController + layout 'nav_only' + + def index + end +end diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 770381472c5..d838b8dc29e 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -5,9 +5,6 @@ class Projects::BlobController < Projects::ApplicationController include RendersBlob include ActionView::Helpers::SanitizeHelper - # Raised when given an invalid file path - InvalidPathError = Class.new(StandardError) - prepend_before_action :authenticate_user!, only: [:edit] before_action :require_non_empty_project, except: [:new, :create] @@ -61,7 +58,6 @@ class Projects::BlobController < Projects::ApplicationController create_commit(Files::UpdateService, success_path: -> { after_edit_path }, failure_view: :edit, failure_path: project_blob_path(@project, @id)) - rescue Files::UpdateService::FileChangedError @conflict = true render :edit @@ -132,7 +128,6 @@ class Projects::BlobController < Projects::ApplicationController def assign_blob_vars @id = params[:id] @ref, @path = extract_ref(@id) - rescue InvalidPathError render_404 end |