summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Johnson <bryce@gitlab.com>2017-04-22 01:47:07 -0400
committerBryce Johnson <bryce@gitlab.com>2017-04-22 01:47:07 -0400
commita02061295995b288ddadd9ddcaa767ef9df0757c (patch)
treebcebe444401da1d0568629d2c17943ebcd2258ef
parentf77a6a998d79136f0a2f81b9bd5ec8f98be238f3 (diff)
downloadgitlab-ce-pipeline-schedule-frontend.tar.gz
Checkpoint. Don't push.pipeline-schedule-frontend
-rw-r--r--app/assets/javascripts/pipeline_schedules/pipeline_schedules_bundle.js1
-rw-r--r--app/controllers/projects/pipeline_schedules_controller.rb2
-rw-r--r--app/views/projects/pipeline_schedules/edit.html.haml11
-rw-r--r--app/views/projects/pipeline_schedules/new.html.haml16
-rw-r--r--config/webpack.config.js1
-rw-r--r--db/schema.rb2
6 files changed, 25 insertions, 8 deletions
diff --git a/app/assets/javascripts/pipeline_schedules/pipeline_schedules_bundle.js b/app/assets/javascripts/pipeline_schedules/pipeline_schedules_bundle.js
new file mode 100644
index 00000000000..2e7d9fa486c
--- /dev/null
+++ b/app/assets/javascripts/pipeline_schedules/pipeline_schedules_bundle.js
@@ -0,0 +1 @@
+console.log("Hello pipeline schedules"); \ No newline at end of file
diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb
index d4e0fc6615f..0500a20a508 100644
--- a/app/controllers/projects/pipeline_schedules_controller.rb
+++ b/app/controllers/projects/pipeline_schedules_controller.rb
@@ -26,6 +26,8 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
end
def create
+ @timezones = TZInfo::Timezone.all.json
+
@pipeline_schedule = Ci::CreatePipelineScheduleService.
new(@project, current_user, pipeline_schedule_params).
execute
diff --git a/app/views/projects/pipeline_schedules/edit.html.haml b/app/views/projects/pipeline_schedules/edit.html.haml
index e2eeb05365d..c221ad5b6e3 100644
--- a/app/views/projects/pipeline_schedules/edit.html.haml
+++ b/app/views/projects/pipeline_schedules/edit.html.haml
@@ -1,7 +1,10 @@
+- @no_container = true
- page_title "Edit", @pipeline_schedule.description, "Pipeline Schedule"
+= render "projects/pipelines/head"
-%h3.page-title
- Edit Pipeline Schedule #{@pipeline_schedule.id}
-%hr
+%div{ class: container_class }
+ %h3.page-title
+ Edit Pipeline Schedule #{@pipeline_schedule.id}
+ %hr
-= render "form"
+ = render "form"
diff --git a/app/views/projects/pipeline_schedules/new.html.haml b/app/views/projects/pipeline_schedules/new.html.haml
index b89e170ad3c..767db2c953e 100644
--- a/app/views/projects/pipeline_schedules/new.html.haml
+++ b/app/views/projects/pipeline_schedules/new.html.haml
@@ -1,7 +1,15 @@
+- @no_container = true
- page_title "New Pipeline Schedule"
+- content_for :page_specific_javascripts do
+ = page_specific_javascript_bundle_tag('pipeline_schedules')
+
+%div
+ = @timezones
+%div{ class: container_class }
+ %h3.page-title
+ Schedule a new pipeline
+ %hr
-%h3.page-title
- Schedule a new pipeline
-%hr
+ = render "form"
-= render "form"
+ \ No newline at end of file
diff --git a/config/webpack.config.js b/config/webpack.config.js
index cb0a57a3a41..396343b168f 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -43,6 +43,7 @@ var config = {
notebook_viewer: './blob/notebook_viewer.js',
pdf_viewer: './blob/pdf_viewer.js',
pipelines: './pipelines/index.js',
+ pipeline_schedules: './pipeline_schedules/pipeline_schedules_bundle.js',
profile: './profile/profile_bundle.js',
protected_branches: './protected_branches/protected_branches_bundle.js',
protected_tags: './protected_tags',
diff --git a/db/schema.rb b/db/schema.rb
index 6dd3cac6b73..8ef3a345d0f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1160,6 +1160,8 @@ ActiveRecord::Schema.define(version: 20170420092524) do
t.datetime "updated_at", null: false
end
+ add_index "system_note_metadata", ["note_id"], name: "index_system_note_metadata_on_note_id", unique: true, using: :btree
+
create_table "taggings", force: :cascade do |t|
t.integer "tag_id"
t.integer "taggable_id"