diff options
| author | Valery Sizov <valery@gitlab.com> | 2014-12-02 12:28:40 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2014-12-02 12:28:40 +0000 |
| commit | 43b1ede6328a104d84881fbd77b11f9f039dc218 (patch) | |
| tree | e6a020e415e6a9477680a0b6334f23d4790248ab | |
| parent | c4ca0e0839148fd1c899432be0d54d9dc0b24037 (diff) | |
| parent | c8799316fdb75b659d5993c8b6676cacd98e0bf1 (diff) | |
| download | gitlab-ci-43b1ede6328a104d84881fbd77b11f9f039dc218.tar.gz | |
Merge branch 'release/5.2.1' into '5-2-stable'
Fixes for 5.2.1
See merge request !93
| -rw-r--r-- | app/controllers/projects_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/admin/projects/show.html.haml | 12 | ||||
| -rw-r--r-- | db/migrate/20141201153755_remove_invalid_build.rb | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 98f13bd..245ec85 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -4,6 +4,7 @@ class ProjectsController < ApplicationController before_filter :authorize_access_project!, except: [:build, :gitlab, :badge, :index, :show, :new, :create] before_filter :authenticate_token!, only: [:build] before_filter :no_cache, only: [:badge] + protect_from_forgery except: :build layout 'project', except: [:index, :gitlab] diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index bddf50f..e0b9e46 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -48,11 +48,13 @@ %strong= @project.email_only_broken_builds .col-md-6 - %fieldset - %legend Build script - = preserve do - %pre - = @project.scripts + - @project.jobs.active.each do |job| + %fieldset + %legend + Build script for #{job.name} + = preserve do + %pre + = job.commands %br %fieldset diff --git a/db/migrate/20141201153755_remove_invalid_build.rb b/db/migrate/20141201153755_remove_invalid_build.rb new file mode 100644 index 0000000..a3a6503 --- /dev/null +++ b/db/migrate/20141201153755_remove_invalid_build.rb @@ -0,0 +1,5 @@ +class RemoveInvalidBuild < ActiveRecord::Migration + def change + execute "DELETE FROM builds WHERE commit_id is NULL" + end +end |