Merge branch 'ci-project-migrate' into 'master'

Ci Project migrate

- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.

In 8.4 or 8.5 we can remove redundant tables and columns.


See merge request !1987

42 files changed, 262 insertions, 506 deletions

diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
new file mode 100644
index 00000000000..6936e614346
--- /dev/null
+++ b/app/views/admin/builds/_build.html.haml
@@ -0,0 +1,73 @@
+- project = build.project
+%tr.build
+  %td.status
+    = ci_status_with_icon(build.status)
+
+  %td.build-link
+    - if build.target_url
+      = link_to build.target_url do
+        %strong Build ##{build.id}
+    - else
+      %strong Build ##{build.id}
+
+    - if build.show_warning?
+      %i.fa.fa-warning.text-warning
+
+  %td
+    - if project
+      = link_to project.name_with_namespace, admin_namespace_project_path(project.namespace, project), class: "monospace"
+
+  %td
+    = link_to build.short_sha, namespace_project_commit_path(project.namespace, project, build.sha), class: "monospace"
+
+  %td
+    - if build.ref
+      = link_to build.ref, namespace_project_commits_path(project.namespace, project, build.ref)
+    - else
+      .light none
+
+  %td
+    - if build.try(:runner)
+      = runner_link(build.runner)
+    - else
+      .light none
+
+  %td
+    #{build.stage} / #{build.name}
+
+    .pull-right
+      - if build.tags.any?
+        - build.tags.each do |tag|
+          %span.label.label-primary
+            = tag
+      - if build.try(:trigger_request)
+        %span.label.label-info triggered
+      - if build.try(:allow_failure)
+        %span.label.label-danger allowed to fail
+
+  %td.duration
+    - if build.duration
+      #{duration_in_words(build.finished_at, build.started_at)}
+
+  %td.timestamp
+    - if build.finished_at
+      %span #{time_ago_with_tooltip(build.finished_at)}
+
+  - if defined?(coverage) && coverage
+    %td.coverage
+      - if build.try(:coverage)
+        #{build.coverage}%
+
+  %td
+    .pull-right
+      - if current_user && can?(current_user, :download_build_artifacts, project) && build.download_url
+        = link_to build.download_url, title: 'Download artifacts' do
+          %i.fa.fa-download
+      - if current_user && can?(current_user, :manage_builds, build.project)
+        - if build.active?
+          - if build.cancel_url
+            = link_to build.cancel_url, method: :post, title: 'Cancel' do
+              %i.fa.fa-remove.cred
+        - elsif defined?(allow_retry) && allow_retry && build.retry_url
+          = link_to build.retry_url, method: :post, title: 'Retry' do
+            %i.fa.fa-repeat
diff --git a/app/views/admin/builds/index.html.haml b/app/views/admin/builds/index.html.haml
new file mode 100644
index 00000000000..55da06a7fe9
--- /dev/null
+++ b/app/views/admin/builds/index.html.haml
@@ -0,0 +1,50 @@
+.project-issuable-filter
+  .controls
+    .pull-left.hidden-xs
+      - if @all_builds.running_or_pending.any?
+        = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
+
+  %ul.center-top-menu
+    %li{class: ('active' if @scope.nil?)}
+      = link_to admin_builds_path do
+        Running
+        %span.badge.js-running-count= @all_builds.running_or_pending.count(:id)
+
+    %li{class: ('active' if @scope == 'finished')}
+      = link_to admin_builds_path(scope: :finished) do
+        Finished
+        %span.badge.js-running-count= @all_builds.finished.count(:id)
+
+    %li{class: ('active' if @scope == 'all')}
+      = link_to admin_builds_path(scope: :all) do
+        All
+        %span.badge.js-totalbuilds-count= @all_builds.count(:id)
+
+.gray-content-block
+  #{(@scope || 'running').capitalize} builds
+
+%ul.content-list
+  - if @builds.blank?
+    %li
+      .nothing-here-block No builds to show
+  - else
+    .table-holder
+      %table.table.builds
+        %thead
+          %tr
+            %th Status
+            %th Build ID
+            %th Project
+            %th Commit
+            %th Ref
+            %th Runner
+            %th Name
+            %th Duration
+            %th Finished at
+            %th
+
+        - @builds.each do |build|
+          = render "admin/builds/build", build: build
+
+    = paginate @builds, theme: 'gitlab'
+
diff --git a/app/views/ci/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index 701782d26bb..6745e58deca 100644
--- a/app/views/ci/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -8,14 +8,14 @@
       %span.label.label-danger paused
 
   %td
-    = link_to ci_admin_runner_path(runner) do
+    = link_to admin_runner_path(runner) do
       = runner.short_sha
   %td
     .runner-description
       = runner.description
       %span (#{link_to 'edit', '#', class: 'edit-runner-link'})
     .runner-description-form.hide
-      = form_for [:ci, :admin, runner], remote: true, html: { class: 'form-inline' } do |f|
+      = form_for [:admin, runner], remote: true, html: { class: 'form-inline' } do |f|
         .form-group
           = f.text_field :description, class: 'form-control'
         = f.submit 'Save', class: 'btn'
@@ -38,11 +38,11 @@
       Never
   %td
     .pull-right
-      = link_to 'Edit', ci_admin_runner_path(runner), class: 'btn btn-sm'
+      = link_to 'Edit', admin_runner_path(runner), class: 'btn btn-sm'
        
       - if runner.active?
-        = link_to 'Pause', [:pause, :ci, :admin, runner], data: { confirm: "Are you sure?" }, method: :get, class: 'btn btn-danger btn-sm'
+        = link_to 'Pause', [:pause, :admin, runner], data: { confirm: "Are you sure?" }, method: :get, class: 'btn btn-danger btn-sm'
       - else
-        = link_to 'Resume', [:resume, :ci, :admin, runner], method: :get, class: 'btn btn-success btn-sm'
-      = link_to 'Remove', [:ci, :admin, runner], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
+        = link_to 'Resume', [:resume, :admin, runner], method: :get, class: 'btn btn-success btn-sm'
+      = link_to 'Remove', [:admin, runner], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
 
diff --git a/app/views/ci/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index bacaccfbffa..26b180b4052 100644
--- a/app/views/ci/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -25,7 +25,7 @@
 
 .append-bottom-20.clearfix
   .pull-left
-    = form_tag ci_admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do
+    = form_tag admin_runners_path, id: 'runners-search', class: 'form-inline', method: :get do
       .form-group
         = search_field_tag :search, params[:search], class: 'form-control', placeholder: 'Runner description or token', spellcheck: false
       = submit_tag 'Search', class: 'btn'
@@ -49,5 +49,5 @@
         %th
 
     - @runners.each do |runner|
-      = render "ci/admin/runners/runner", runner: runner
+      = render "admin/runners/runner", runner: runner
 = paginate @runners
diff --git a/app/views/ci/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml
index fd3d33d657b..32051852dc0 100644
--- a/app/views/ci/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@@ -22,7 +22,7 @@
     %h4 This runner will process builds only from ASSIGNED projects
     %p You can't make this a shared runner.
 %hr
-= form_for @runner, url: ci_admin_runner_path(@runner), html: { class: 'form-horizontal' } do |f|
+= form_for @runner, url: admin_runner_path(@runner), html: { class: 'form-horizontal' } do |f|
   .form-group
     = label_tag :token, class: 'control-label' do
       Token
@@ -53,29 +53,24 @@
             %th
         - @runner.runner_projects.each do |runner_project|
           - project = runner_project.project
-          - if project.gl_project
+          - if project
             %tr.alert-info
               %td
                 %strong
-                  = project.name
+                  = project.name_with_namespace
               %td
                 .pull-right
-                  = link_to 'Disable', [:ci, :admin, project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
+                  = link_to 'Disable', [:admin, project.namespace, project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
 
     %table.table
       %thead
         %tr
           %th Project
           %th
-            .pull-right
-              = link_to 'Assign to all', assign_all_ci_admin_runner_path(@runner),
-                class: 'btn btn-sm assign-all-runner',
-                title: 'Assign runner to all projects',
-                method: :put
 
       %tr
         %td
-          = form_tag ci_admin_runner_path(@runner), id: 'runner-projects-search', class: 'form-inline', method: :get do
+          = form_tag admin_runner_path(@runner), id: 'runner-projects-search', class: 'form-inline', method: :get do
             .form-group
               = search_field_tag :search, params[:search], class: 'form-control', spellcheck: false
             = submit_tag 'Search', class: 'btn'
@@ -84,44 +79,44 @@
       - @projects.each do |project|
         %tr
           %td
-            = project.name
+            = project.name_with_namespace
           %td
             .pull-right
-              = form_for [:ci, :admin, project, project.runner_projects.new] do |f|
+              = form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
                 = f.hidden_field :runner_id, value: @runner.id
                 = f.submit 'Enable', class: 'btn btn-xs'
     = paginate @projects
 
   .col-md-6
     %h4 Recent builds served by this runner
-    %table.builds.runner-builds
+    %table.table.builds.runner-builds
       %thead
         %tr
-          %th Build ID
+          %th Build
           %th Status
           %th Project
           %th Commit
           %th Finished at
 
       - @builds.each do |build|
-        - gl_project = build.gl_project
+        - project = build.project
         %tr.build
           %td.id
-            - if gl_project
-              = link_to namespace_project_build_path(gl_project.namespace, gl_project, build) do
-                = build.id
+            - if project
+              = link_to namespace_project_build_path(project.namespace, project, build) do
+                %strong ##{build.id}
             - else
-              = build.id
+              %strong ##{build.id}
 
           %td.status
             = ci_status_with_icon(build.status)
 
           %td.status
-            - if gl_project
-              = gl_project.name_with_namespace
+            - if project
+              = project.name_with_namespace
 
           %td.build-link
-            - if gl_project
+            - if project
               = link_to ci_status_path(build.commit) do
                 %strong #{build.commit.short_sha}
 
diff --git a/app/views/ci/admin/runners/update.js.haml b/app/views/admin/runners/update.js.haml
index 2b7d3067e20..2b7d3067e20 100644
--- a/app/views/ci/admin/runners/update.js.haml
+++ b/app/views/admin/runners/update.js.haml
diff --git a/app/views/ci/admin/application_settings/_form.html.haml b/app/views/ci/admin/application_settings/_form.html.haml
deleted file mode 100644
index 634c9daa477..00000000000
--- a/app/views/ci/admin/application_settings/_form.html.haml
+++ /dev/null
@@ -1,24 +0,0 @@
-= form_for @application_setting, url: ci_admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
-  - if @application_setting.errors.any?
-    #error_explanation
-      .alert.alert-danger
-        - @application_setting.errors.full_messages.each do |msg|
-          %p= msg
-
-  %fieldset
-    %legend Default Project Settings
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .checkbox
-          = f.label :all_broken_builds do
-            = f.check_box :all_broken_builds
-            Send emails only on broken builds
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .checkbox
-          = f.label :add_pusher do
-            = f.check_box :add_pusher
-            Add pusher to recipients list
-
-  .form-actions
-    = f.submit 'Save', class: 'btn btn-primary'
diff --git a/app/views/ci/admin/application_settings/show.html.haml b/app/views/ci/admin/application_settings/show.html.haml
deleted file mode 100644
index 7ef0aa89ed6..00000000000
--- a/app/views/ci/admin/application_settings/show.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%h3.page-title Settings
-%hr
-= render 'form'
diff --git a/app/views/ci/admin/builds/_build.html.haml b/app/views/ci/admin/builds/_build.html.haml
deleted file mode 100644
index 2df58713214..00000000000
--- a/app/views/ci/admin/builds/_build.html.haml
+++ /dev/null
@@ -1,34 +0,0 @@
-- gl_project = build.project.gl_project
-- if build.commit && build.project
-  %tr.build
-    %td.build-link
-      = link_to namespace_project_build_path(gl_project.namespace, gl_project, build) do
-        %strong #{build.id}
-
-    %td.status
-      = ci_status_with_icon(build.status)
-
-    %td.commit-link
-      = link_to ci_status_path(build.commit) do
-        %strong #{build.commit.short_sha}
-
-    %td.runner
-      - if build.runner
-        = link_to build.runner.id, ci_admin_runner_path(build.runner)
-
-    %td.build-project
-      = truncate build.project.name, length: 30
-
-    %td.build-message
-      %span= truncate(build.commit.git_commit_message, length: 30)
-
-    %td.build-branch
-      %span= truncate(build.ref, length: 25)
-
-    %td.duration
-      - if build.duration
-        #{duration_in_words(build.finished_at, build.started_at)}
-
-    %td.timestamp
-      - if build.finished_at
-        %span #{time_ago_in_words build.finished_at} ago
diff --git a/app/views/ci/admin/builds/index.html.haml b/app/views/ci/admin/builds/index.html.haml
deleted file mode 100644
index d23119162cc..00000000000
--- a/app/views/ci/admin/builds/index.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-%ul.nav.nav-tabs.append-bottom-20
-  %li{class: ("active" if @scope.nil?)}
-    = link_to 'All builds', ci_admin_builds_path
-  
-  %li{class: ("active" if @scope == "pending")}
-    = link_to "Pending", ci_admin_builds_path(scope: :pending)
-
-  %li{class: ("active" if @scope == "running")}
-    = link_to "Running", ci_admin_builds_path(scope: :running)
-
-
-%table.builds
-  %thead
-    %tr
-      %th Build
-      %th Status
-      %th Commit
-      %th Runner
-      %th Project
-      %th Message
-      %th Branch
-      %th Duration
-      %th Finished at
-
-  - @builds.each do |build|
-    = render "ci/admin/builds/build", build: build
-
-= paginate @builds
diff --git a/app/views/ci/admin/events/index.html.haml b/app/views/ci/admin/events/index.html.haml
deleted file mode 100644
index 5a5b4dc7c35..00000000000
--- a/app/views/ci/admin/events/index.html.haml
+++ /dev/null
@@ -1,18 +0,0 @@
-.table-holder
-  %table.table
-    %thead
-      %tr
-        %th User ID
-        %th Description
-        %th When
-    - @events.each do |event|
-      %tr
-        %td
-          = event.user_id
-        %td
-          = event.description
-        %td.light
-          = time_ago_in_words event.updated_at
-          ago
-
-= paginate @events
diff --git a/app/views/ci/admin/projects/_project.html.haml b/app/views/ci/admin/projects/_project.html.haml
deleted file mode 100644
index a342d6e1cf0..00000000000
--- a/app/views/ci/admin/projects/_project.html.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-- last_commit = project.commits.last
-%tr
-  %td
-    = project.id
-  %td
-    = link_to [:ci, project] do
-      %strong= project.name
-  %td
-    - if last_commit
-      = ci_status_with_icon(last_commit.status)
-      - if project.last_commit_date
-        ·
-        = time_ago_in_words project.last_commit_date
-        ago
-    - else
-      No builds yet
-  %td
-    - if project.public
-      %i.fa.fa-globe
-      Public
-    - else
-      %i.fa.fa-lock
-      Private
-  %td
-    = project.commits.count
-  %td
-    = link_to [:ci, :admin, project], method: :delete, class: 'btn btn-danger btn-sm' do
-      %i.fa.fa-remove
-      Remove
diff --git a/app/views/ci/admin/projects/index.html.haml b/app/views/ci/admin/projects/index.html.haml
deleted file mode 100644
index 0da8547924b..00000000000
--- a/app/views/ci/admin/projects/index.html.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-.table-holder
-  %table.table
-    %thead
-      %tr
-        %th ID
-        %th Name
-        %th Last build
-        %th Access
-        %th Builds
-        %th
-
-    - @projects.each do |project|
-      = render "ci/admin/projects/project", project: project
-
-= paginate @projects
-
diff --git a/app/views/ci/admin/runner_projects/index.html.haml b/app/views/ci/admin/runner_projects/index.html.haml
deleted file mode 100644
index 6b4e3b2cb38..00000000000
--- a/app/views/ci/admin/runner_projects/index.html.haml
+++ /dev/null
@@ -1,57 +0,0 @@
-%p.lead
-  To register a new runner visit #{link_to 'this page ', ci_runners_path}
-
-.row
-  .col-md-8
-    %h5 Activated:
-    %table.table
-      %tr
-        %th Runner ID
-        %th Runner Description
-        %th Last build
-        %th Builds Stats
-        %th Registered
-        %th
-
-      - @runner_projects.each do |runner_project|
-        - runner = runner_project.runner
-        - builds = runner.builds.where(project_id: @project.id)
-        %tr
-          %td
-            %span.badge.badge-info= runner.id
-          %td
-            = runner.display_name
-          %td
-            - last_build = builds.last
-            - if last_build
-              = link_to last_build.short_sha, [last_build.project, last_build]
-            - else
-              unknown
-          %td
-            %span.badge.badge-success
-              #{builds.success.count}
-            %span /
-            %span.badge.badge-important
-              #{builds.failed.count}
-          %td
-            #{time_ago_in_words(runner_project.created_at)} ago
-          %td
-            = link_to 'Disable', [:ci, @project, runner_project], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm right'
-  .col-md-4
-    %h5 Available
-    %table.table
-      %tr
-        %th ID
-        %th Token
-        %th
-
-      - (Ci::Runner.all - @project.runners).each do |runner|
-        %tr
-          %td
-            = runner.id
-          %td
-            = runner.token
-          %td
-            = form_for [:ci, @project, @runner_project] do |f|
-              = f.hidden_field :runner_id, value: runner.id
-              = f.submit 'Add', class: 'btn btn-sm'
diff --git a/app/views/ci/commits/_commit.html.haml b/app/views/ci/commits/_commit.html.haml
index b24a3b826cf..11163813f3e 100644
--- a/app/views/ci/commits/_commit.html.haml
+++ b/app/views/ci/commits/_commit.html.haml
@@ -27,7 +27,6 @@
     - if commit.finished_at
       %span #{time_ago_in_words commit.finished_at} ago
 
-  - if commit.project.coverage_enabled?
+  - if commit.coverage
     %td.coverage
-      - if commit.coverage
-        #{commit.coverage}%
+      #{commit.coverage}%
diff --git a/app/views/ci/shared/_guide.html.haml b/app/views/ci/shared/_guide.html.haml
index db2d7f2f4b6..09e7e653521 100644
--- a/app/views/ci/shared/_guide.html.haml
+++ b/app/views/ci/shared/_guide.html.haml
@@ -4,12 +4,10 @@
   %ol
     %li
       Add at least one runner to the project.
-      Go to #{link_to 'Runners page', runners_path(@project.gl_project), target: :blank} for instructions.
+      Go to #{link_to 'Runners page', runners_path(@project), target: :blank} for instructions.
     %li
-      Put the .gitlab-ci.yml in the root of your repository. Examples can be found in #{link_to "Configuring project (.gitlab-ci.yml)", "http://doc.gitlab.com/ci/yaml/README.html", target: :blank}.
+      Put the .gitlab-ci.yml in the root of your repository. Examples can be found in
+      #{link_to "Configuring project (.gitlab-ci.yml)", "http://doc.gitlab.com/ci/yaml/README.html", target: :blank}.
       You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
     %li
-      Visit #{link_to 'GitLab project settings', @project.gitlab_url + "/services/gitlab_ci/edit", target: :blank}
-      and press the "Test settings" button.
-    %li
       Return to this page and refresh it, it should show a new build.
diff --git a/app/views/ci/user_sessions/new.html.haml b/app/views/ci/user_sessions/new.html.haml
deleted file mode 100644
index b8d9a1d7089..00000000000
--- a/app/views/ci/user_sessions/new.html.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-.login-block
-  %h2 Login using GitLab account
-  %p.light
-    Make sure you have an account on the GitLab server
-    = link_to GitlabCi.config.gitlab_server.url, GitlabCi.config.gitlab_server.url, no_turbolink
-  %hr
-  = link_to "Login with GitLab", auth_ci_user_sessions_path(state: params[:state]), no_turbolink.merge( class: 'btn btn-login btn-success' )
diff --git a/app/views/layouts/ci/_nav_admin.html.haml b/app/views/layouts/ci/_nav_admin.html.haml
deleted file mode 100644
index dcda04a4638..00000000000
--- a/app/views/layouts/ci/_nav_admin.html.haml
+++ /dev/null
@@ -1,35 +0,0 @@
-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to admin_root_path, title: 'Back to admin', data: {placement: 'right'}, class: 'back-link' do
-      = icon('caret-square-o-left fw')
-      %span
-        Back to admin
-
-  %li.separate-item
-  = nav_link path: 'projects#index' do
-    = link_to ci_admin_projects_path do
-      = icon('list-alt fw')
-      %span
-        Projects
-  = nav_link path: 'events#index' do
-    = link_to ci_admin_events_path do
-      = icon('book fw')
-      %span
-        Events
-  = nav_link path: ['runners#index', 'runners#show'] do
-    = link_to ci_admin_runners_path do
-      = icon('cog fw')
-      %span
-        Runners
-        %span.count= Ci::Runner.count(:all)
-  = nav_link path: 'builds#index' do
-    = link_to ci_admin_builds_path do
-      = icon('link fw')
-      %span
-        Builds
-        %span.count= Ci::Build.count(:all)
-  = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
-    = link_to ci_admin_application_settings_path do
-      = icon('cogs fw')
-      %span
-        Settings
diff --git a/app/views/layouts/ci/_nav_project.html.haml b/app/views/layouts/ci/_nav_project.html.haml
deleted file mode 100644
index f094edbfa87..00000000000
--- a/app/views/layouts/ci/_nav_project.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to project_path(@project.gl_project), title: 'Back to project', data: {placement: 'right'}, class: 'back-link' do
-      = icon('caret-square-o-left fw')
-      %span
-        Back to project
-  %li.separate-item
-    = nav_link path: 'events#index' do
-      = link_to ci_project_events_path(@project) do
-        = icon('book fw')
-        %span
-          Events
diff --git a/app/views/layouts/ci/admin.html.haml b/app/views/layouts/ci/admin.html.haml
deleted file mode 100644
index c8cb185d28c..00000000000
--- a/app/views/layouts/ci/admin.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render 'layouts/head'
-  %body{class: "ci-body #{user_application_theme}", 'data-page' => body_data_page}
-    - header_title = "Admin area"
-    - if current_user
-      = render "layouts/header/default", title: header_title
-    - else
-      = render "layouts/header/public", title: header_title
-
-    = render 'layouts/ci/page', sidebar: 'nav_admin'
diff --git a/app/views/layouts/ci/application.html.haml b/app/views/layouts/ci/application.html.haml
deleted file mode 100644
index 38023468d0b..00000000000
--- a/app/views/layouts/ci/application.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-!!! 5
-%html{ lang: "en"}
-  = render 'layouts/head'
-  %body{class: "ci-body #{user_application_theme}", 'data-page' => body_data_page}
-    - header_title = "Continuous Integration"
-    - if current_user
-      = render "layouts/header/default", title: header_title
-    - else
-      = render "layouts/header/public", title: header_title
-
-    = render 'layouts/ci/page'
diff --git a/app/views/layouts/nav/_admin.html.haml b/app/views/layouts/nav/_admin.html.haml
index d04a3d1f227..c60ac5eefac 100644
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
@@ -24,11 +24,18 @@
       = icon('key fw')
       %span
         Deploy Keys
-  = nav_link do
-    = link_to ci_admin_projects_path, title: 'Continuous Integration' do
-      = icon('building fw')
+  = nav_link path: ['runners#index', 'runners#show'] do
+    = link_to admin_runners_path do
+      = icon('cog fw')
+      %span
+        Runners
+        %span.count= Ci::Runner.count(:all)
+  = nav_link path: 'builds#index' do
+    = link_to admin_builds_path do
+      = icon('link fw')
       %span
-        Continuous Integration
+        Builds
+        %span.count= Ci::Build.count(:all)
   = nav_link(controller: :logs) do
     = link_to admin_logs_path, title: 'Logs' do
       = icon('file-text fw')
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index 2fcba7bd672..c0d62028639 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -44,7 +44,7 @@
         = icon('cubes fw')
         %span
           Builds
-          %span.count.builds_counter= @project.ci_builds.running_or_pending.count(:all)
+          %span.count.builds_counter= @project.builds.running_or_pending.count(:all)
 
   - if project_nav_tab? :graphs
     = nav_link(controller: %w(graphs)) do
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index 4b32c631d5c..970da78a5c9 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -50,8 +50,3 @@
           = icon('retweet fw')
           %span
             Triggers
-      = nav_link path: 'ci_settings#edit' do
-        = link_to edit_namespace_project_ci_settings_path(@project.namespace, @project), title: 'CI Settings' do
-          = icon('building fw')
-          %span
-            CI Settings
diff --git a/app/views/notify/build_fail_email.html.haml b/app/views/notify/build_fail_email.html.haml
index 3b251dc011a..f4e9749e5c7 100644
--- a/app/views/notify/build_fail_email.html.haml
+++ b/app/views/notify/build_fail_email.html.haml
@@ -7,7 +7,7 @@
     = @project.name
 
 %p
-  Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.gl_project.namespace, @build.gl_project, @build.sha)}
+  Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.project.namespace, @build.project, @build.sha)}
 %p
   Author: #{@build.commit.git_author_name}
 %p
@@ -20,4 +20,4 @@
   Message: #{@build.commit.git_commit_message}
 
 %p
-  Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build)}
+  Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.project.namespace, @build.project, @build)}
diff --git a/app/views/notify/build_fail_email.text.erb b/app/views/notify/build_fail_email.text.erb
index 17a3b9b1d33..675acea60a1 100644
--- a/app/views/notify/build_fail_email.text.erb
+++ b/app/views/notify/build_fail_email.text.erb
@@ -8,4 +8,4 @@ Stage:    <%= @build.stage %>
 Job:      <%= @build.name %>
 Message:  <%= @build.commit.git_commit_message %>
 
-Url:      <%= namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build) %>
+Url:      <%= namespace_project_build_url(@build.project.namespace, @build.project, @build) %>
diff --git a/app/views/notify/build_success_email.html.haml b/app/views/notify/build_success_email.html.haml
index c23f4b7e45a..8b004d34cca 100644
--- a/app/views/notify/build_success_email.html.haml
+++ b/app/views/notify/build_success_email.html.haml
@@ -8,7 +8,7 @@
     = @project.name
 
 %p
-  Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.gl_project.namespace, @build.gl_project, @build.sha)}
+  Commit: #{link_to @build.short_sha, namespace_project_commit_url(@build.project.namespace, @build.project, @build.sha)}
 %p
   Author: #{@build.commit.git_author_name}
 %p
@@ -21,4 +21,4 @@
   Message: #{@build.commit.git_commit_message}
 
 %p
-  Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build)}
+  Build details: #{link_to "Build #{@build.id}", namespace_project_build_url(@build.project.namespace, @build.project, @build)}
diff --git a/app/views/notify/build_success_email.text.erb b/app/views/notify/build_success_email.text.erb
index bc8b978c3d7..747da44acae 100644
--- a/app/views/notify/build_success_email.text.erb
+++ b/app/views/notify/build_success_email.text.erb
@@ -8,4 +8,4 @@ Stage:    <%= @build.stage %>
 Job:      <%= @build.name %>
 Message:  <%= @build.commit.git_commit_message %>
 
-Url:      <%= namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build) %>
+Url:      <%= namespace_project_build_url(@build.project.namespace, @build.project, @build) %>
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index fbf2c293db8..1a26908ab11 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -3,7 +3,7 @@
 
 .project-issuable-filter
   .controls
-    - if @ci_project && can?(current_user, :manage_builds, @project)
+    - if can?(current_user, :manage_builds, @project)
       .pull-left.hidden-xs
         - if @all_builds.running_or_pending.any?
           = link_to 'Cancel running', cancel_all_namespace_project_builds_path(@project.namespace, @project), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
@@ -40,7 +40,7 @@
         %thead
           %tr
             %th Status
-            %th Build ID
+            %th Runner
             %th Commit
             %th Ref
             %th Stage
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index d5e81f84b56..20a5b6a66e7 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -56,7 +56,7 @@
 
           %br
           Go to
-          = link_to namespace_project_runners_path(@build.gl_project.namespace, @build.gl_project) do
+          = link_to namespace_project_runners_path(@build.project.namespace, @build.project) do
             Runners page
 
   .row.prepend-top-default
@@ -113,7 +113,7 @@
         %p
           %span.attr-name Runner:
           - if @build.runner && current_user && current_user.admin
-            = link_to "##{@build.runner.id}", ci_admin_runner_path(@build.runner.id)
+            = link_to "##{@build.runner.id}", admin_runner_path(@build.runner.id)
           - elsif @build.runner
             \##{@build.runner.id}
 
diff --git a/app/views/projects/ci_settings/_form.html.haml b/app/views/projects/ci_settings/_form.html.haml
deleted file mode 100644
index ee6b8885e2d..00000000000
--- a/app/views/projects/ci_settings/_form.html.haml
+++ /dev/null
@@ -1,120 +0,0 @@
-%h3.page-title
-  CI settings
-%hr
-.bs-callout.help-callout
-  %p
-    If you want to test your .gitlab-ci.yml, you can use special tool - #{link_to "Lint", ci_lint_path}
-  %p
-    Edit your
-    #{link_to ".gitlab-ci.yml using web-editor", yaml_web_editor_link(@ci_project)}
-
-- unless @project.empty_repo?
-  %p
-    Paste build status image for #{@repository.root_ref} with next link
-    = link_to '#', class: 'badge-codes-toggle btn btn-default btn-xs' do
-      Status Badge
-    .badge-codes-block.bs-callout.bs-callout-info.hide
-      %p
-        Status badge for
-        %span.label.label-info #{@ref}
-        branch
-      %div
-        %label Markdown:
-        = text_field_tag 'badge_md', markdown_badge_code(@ci_project, @repository.root_ref), readonly: true, class: 'form-control'
-        %label Html:
-        = text_field_tag 'badge_html', html_badge_code(@ci_project, @repository.root_ref), readonly: true, class: 'form-control'
-
-= nested_form_for @ci_project, url: namespace_project_ci_settings_path(@project.namespace, @project), html: { class: 'form-horizontal' } do |f|
-  - if @ci_project.errors.any?
-    #error_explanation
-      %p.lead= "#{pluralize(@ci_project.errors.count, "error")} prohibited this project from being saved:"
-      .alert.alert-error
-        %ul
-          - @ci_project.errors.full_messages.each do |msg|
-            %li= msg
-
-  %fieldset
-    %legend Build settings
-    .form-group
-      = label_tag nil, class: 'control-label' do
-        Get code
-      .col-sm-10
-        %p Get recent application code using the following command:
-        .radio
-          = label_tag do
-            = f.radio_button :allow_git_fetch, 'false'
-            %strong git clone
-            .light Slower but makes sure you have a clean dir before every build
-        .radio
-          = label_tag do
-            = f.radio_button :allow_git_fetch, 'true'
-            %strong git fetch
-            .light Faster
-    .form-group
-      = f.label :timeout_in_minutes, 'Timeout', class: 'control-label'
-      .col-sm-10
-        = f.number_field :timeout_in_minutes, class: 'form-control', min: '0'
-        .light per build in minutes
-
-
-  %fieldset
-    %legend Build Schedule
-    .form-group
-      = f.label :always_build, 'Schedule build', class: 'control-label'
-      .col-sm-10
-        .checkbox
-          = f.label :always_build do
-            = f.check_box :always_build
-            %span.light Repeat last build after X hours if no builds
-    .form-group
-      = f.label :polling_interval, "Build interval", class: 'control-label'
-      .col-sm-10
-        = f.number_field :polling_interval, placeholder: '5', min: '0', class: 'form-control'
-        .light In hours
-
-  %fieldset
-    %legend Project settings
-    .form-group
-      = f.label :default_ref, "Make tabs for the following branches", class: 'control-label'
-      .col-sm-10
-        = f.text_field :default_ref, class: 'form-control', placeholder: 'master, stable'
-        .light You will be able to filter builds by the following branches
-    .form-group
-      = f.label :public, 'Public mode', class: 'control-label'
-      .col-sm-10
-        .checkbox
-          = f.label :public do
-            = f.check_box :public
-            %span.light Anyone can see project and builds
-    .form-group
-      = f.label :coverage_regex, "Test coverage parsing", class: 'control-label'
-      .col-sm-10
-        .input-group
-          %span.input-group-addon /
-          = f.text_field :coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
-          %span.input-group-addon /
-        .light We will use this regular expression to find test coverage output in build trace. Leave blank if you want to disable this feature
-        .bs-callout.bs-callout-info
-          %p Below are examples of regex for existing tools:
-          %ul
-            %li
-              Simplecov (Ruby) -
-              %code \(\d+.\d+\%\) covered
-            %li
-              pytest-cov (Python) -
-              %code \d+\%\s*$
-            %li
-              phpunit --coverage-text --colors=never (PHP) -
-              %code ^\s*Lines:\s*\d+.\d+\%
-
-  %fieldset
-    %legend Advanced settings
-    .form-group
-      = f.label :token, "CI token", class: 'control-label'
-      .col-sm-10
-        = f.text_field :token, class: 'form-control', placeholder: 'xEeFCaDAB89'
-
-  .form-actions
-    = f.submit 'Save changes', class: 'btn btn-save'
-    - unless @ci_project.new_record?
-      = link_to 'Remove Project', ci_project_path(@ci_project), method: :delete, data: { confirm: 'Project will be removed. Are you sure?' }, class: 'btn btn-danger pull-right'
diff --git a/app/views/projects/ci_settings/_no_runners.html.haml b/app/views/projects/ci_settings/_no_runners.html.haml
deleted file mode 100644
index 1374e6680f9..00000000000
--- a/app/views/projects/ci_settings/_no_runners.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-.alert.alert-danger
-  %p
-    There are NO runners to build this project.
-    %br
-    You can add Specific runner for this project on Runners page
-
-    - if current_user.admin
-      or add Shared runner for whole application in admin area.
diff --git a/app/views/projects/ci_settings/edit.html.haml b/app/views/projects/ci_settings/edit.html.haml
deleted file mode 100644
index acc912d4596..00000000000
--- a/app/views/projects/ci_settings/edit.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-- page_title "CI Settings"
-
-- if no_runners_for_project?(@ci_project)
-  = render 'no_runners'
-
-= render 'form'
diff --git a/app/views/projects/commit/_builds.html.haml b/app/views/projects/commit/_builds.html.haml
index e4d81182c1a..329aaa0bb8b 100644
--- a/app/views/projects/commit/_builds.html.haml
+++ b/app/views/projects/commit/_builds.html.haml
@@ -1,17 +1,17 @@
 .gray-content-block.middle-block
   .pull-right
-    - if @ci_project && can?(current_user, :manage_builds, @ci_commit.gl_project)
+    - if can?(current_user, :manage_builds, @ci_commit.project)
       - if @ci_commit.builds.latest.failed.any?(&:retryable?)
-        = link_to "Retry failed", retry_builds_namespace_project_commit_path(@ci_commit.gl_project.namespace, @ci_commit.gl_project, @ci_commit.sha), class: 'btn btn-grouped btn-primary', method: :post
+        = link_to "Retry failed", retry_builds_namespace_project_commit_path(@ci_commit.project.namespace, @ci_commit.project, @ci_commit.sha), class: 'btn btn-grouped btn-primary', method: :post
 
       - if @ci_commit.builds.running_or_pending.any?
-        = link_to "Cancel running", cancel_builds_namespace_project_commit_path(@ci_commit.gl_project.namespace, @ci_commit.gl_project, @ci_commit.sha), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
+        = link_to "Cancel running", cancel_builds_namespace_project_commit_path(@ci_commit.project.namespace, @ci_commit.project, @ci_commit.sha), data: { confirm: 'Are you sure?' }, class: 'btn btn-grouped btn-danger', method: :post
 
   .oneline
     = pluralize @statuses.count(:id), "build"
     - if defined?(link_to_commit) && link_to_commit
       for commit
-      = link_to @ci_commit.short_sha, namespace_project_commit_path(@ci_commit.gl_project.namespace, @ci_commit.gl_project, @ci_commit.sha), class: "monospace"
+      = link_to @ci_commit.short_sha, namespace_project_commit_path(@ci_commit.project.namespace, @ci_commit.project, @ci_commit.sha), class: "monospace"
     - if @ci_commit.duration > 0
       in
       = time_interval_in_words @ci_commit.duration
@@ -22,8 +22,9 @@
     %ul
       - @ci_commit.yaml_errors.split(",").each do |error|
         %li= error
+    You can also test your .gitlab-ci.yml in the #{link_to "Lint", ci_lint_path}
 
-- if @ci_commit.gl_project.builds_enabled? && !@ci_commit.ci_yaml_file
+- if @ci_commit.project.builds_enabled? && !@ci_commit.ci_yaml_file
   .bs-callout.bs-callout-warning
     \.gitlab-ci.yml not found in this commit
 
@@ -38,12 +39,12 @@
         %th Name
         %th Duration
         %th Finished at
-        - if @ci_project && @ci_project.coverage_enabled?
+        - if @ci_commit.project.build_coverage_enabled?
           %th Coverage
         %th
     - @ci_commit.refs.each do |ref|
       = render partial: "projects/commit_statuses/commit_status", collection: @ci_commit.statuses.for_ref(ref).latest.ordered,
-               locals: { coverage: @ci_project.try(:coverage_enabled?), stage: true, allow_retry: true }
+               locals: { coverage: @ci_commit.project.build_coverage_enabled?, stage: true, allow_retry: true }
 
 - if @ci_commit.retried.any?
   .gray-content-block.second-block
@@ -60,8 +61,8 @@
           %th Name
           %th Duration
           %th Finished at
-          - if @ci_project && @ci_project.coverage_enabled?
+          - if @ci_commit.project.build_coverage_enabled?
             %th Coverage
           %th
       = render partial: "projects/commit_statuses/commit_status", collection: @ci_commit.retried,
-               locals: { coverage: @ci_project.try(:coverage_enabled?), stage: true }
+               locals: { coverage: @ci_commit.project.build_coverage_enabled?, stage: true }
diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml
index a527bb2f84a..45a00e4d259 100644
--- a/app/views/projects/commit_statuses/_commit_status.html.haml
+++ b/app/views/projects/commit_statuses/_commit_status.html.haml
@@ -69,7 +69,7 @@
       - if current_user && can?(current_user, :download_build_artifacts, @project) && commit_status.download_url
         = link_to commit_status.download_url, title: 'Download artifacts' do
           %i.fa.fa-download
-      - if current_user && can?(current_user, :manage_builds, commit_status.gl_project)
+      - if current_user && can?(current_user, :manage_builds, commit_status.project)
         - if commit_status.active?
           - if commit_status.cancel_url
             = link_to commit_status.cancel_url, method: :post, title: 'Cancel' do
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index d865d299135..650629ef1b9 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -112,6 +112,62 @@
                   %hr
                   = link_to 'Remove avatar', namespace_project_avatar_path(@project.namespace, @project), data: { confirm: "Project avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"
 
+          %fieldset.features
+            %legend
+              Continuous Integration
+            .form-group
+              .col-sm-offset-2.col-sm-10
+                %p Get recent application code using the following command:
+                .radio
+                  = f.label :build_allow_git_fetch do
+                    = f.radio_button :build_allow_git_fetch, 'false'
+                    %strong git clone
+                    %br
+                    %span.descr Slower but makes sure you have a clean dir before every build
+                .radio
+                  = f.label :build_allow_git_fetch do
+                    = f.radio_button :build_allow_git_fetch, 'true'
+                    %strong git fetch
+                    %br
+                    %span.descr Faster
+            .form-group
+              = f.label :build_timeout_in_minutes, 'Timeout', class: 'control-label'
+              .col-sm-10
+                = f.number_field :build_timeout_in_minutes, class: 'form-control', min: '0'
+                %p.help-block per build in minutes
+            .form-group
+              = f.label :build_coverage_regex, "Test coverage parsing", class: 'control-label'
+              .col-sm-10
+                .input-group
+                  %span.input-group-addon /
+                  = f.text_field :build_coverage_regex, class: 'form-control', placeholder: '\(\d+.\d+\%\) covered'
+                  %span.input-group-addon /
+                %p.help-block
+                  We will use this regular expression to find test coverage output in build trace.
+                  Leave blank if you want to disable this feature
+                .bs-callout.bs-callout-info
+                  %p Below are examples of regex for existing tools:
+                  %ul
+                    %li
+                      Simplecov (Ruby) -
+                      %code \(\d+.\d+\%\) covered
+                    %li
+                      pytest-cov (Python) -
+                      %code \d+\%\s*$
+                    %li
+                      phpunit --coverage-text --colors=never (PHP) -
+                      %code ^\s*Lines:\s*\d+.\d+\%
+
+
+          %fieldset.features
+            %legend
+              Advanced settings
+            .form-group
+              = f.label :runners_token, "CI token", class: 'control-label'
+              .col-sm-10
+                = f.text_field :runners_token, class: "form-control", placeholder: 'xEeFCaDAB89'
+                %p.help-block The secure token used to checkout project.
+
           .form-actions
             = f.submit 'Save changes', class: "btn btn-save"
 
diff --git a/app/views/projects/graphs/ci/_overall.haml b/app/views/projects/graphs/ci/_overall.haml
index cf4285a2671..4b12e5f2da1 100644
--- a/app/views/projects/graphs/ci/_overall.haml
+++ b/app/views/projects/graphs/ci/_overall.haml
@@ -1,20 +1,19 @@
-- ci_project = @project.gitlab_ci_project
 %h4 Overall stats
 %ul
   %li
     Total:
-    %strong= pluralize ci_project.builds.count(:all), 'build'
+    %strong= pluralize @project.builds.count(:all), 'build'
   %li
     Successful:
-    %strong= pluralize ci_project.builds.success.count(:all), 'build'
+    %strong= pluralize @project.builds.success.count(:all), 'build'
   %li
     Failed:
-    %strong= pluralize ci_project.builds.failed.count(:all), 'build'
+    %strong= pluralize @project.builds.failed.count(:all), 'build'
   %li
     Success ratio:
     %strong
-      #{success_ratio(ci_project.builds.success, ci_project.builds.failed)}%
+      #{success_ratio(@project.builds.success, @project.builds.failed)}%
   %li
     Commits covered:
     %strong
-      = ci_project.commits.count(:all)
+      = @project.ci_commits.count(:all)
diff --git a/app/views/projects/runners/_runner.html.haml b/app/views/projects/runners/_runner.html.haml
index e6b8a2e6fe7..4d95afc28bb 100644
--- a/app/views/projects/runners/_runner.html.haml
+++ b/app/views/projects/runners/_runner.html.haml
@@ -15,10 +15,10 @@
         - if runner.belongs_to_one_project?
           = link_to 'Remove runner', runner_path(runner), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
         - else
-          - runner_project = @ci_project.runner_projects.find_by(runner_id: runner)
-          = link_to 'Disable for this project', [:ci, @ci_project, runner_project], data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
+          - runner_project = @project.runner_projects.find_by(runner_id: runner)
+          = link_to 'Disable for this project', namespace_project_runner_project_path(@project.namespace, @project, runner_project), data: { confirm: "Are you sure?" }, method: :delete, class: 'btn btn-danger btn-sm'
       - elsif runner.specific?
-        = form_for [:ci, @ci_project, @ci_project.runner_projects.new] do |f|
+        = form_for [@project.namespace, @project, @project.runner_projects.new] do |f|
           = f.hidden_field :runner_id, value: runner.id
           = f.submit 'Enable for this project', class: 'btn btn-sm'
   .pull-right
diff --git a/app/views/projects/runners/_shared_runners.html.haml b/app/views/projects/runners/_shared_runners.html.haml
index 8be3d379828..6a37f444bb7 100644
--- a/app/views/projects/runners/_shared_runners.html.haml
+++ b/app/views/projects/runners/_shared_runners.html.haml
@@ -3,11 +3,11 @@
 .bs-callout.bs-callout-warning
   GitLab Runners do not offer secure isolation between projects that they do builds for. You are TRUSTING all GitLab users who can push code to project A, B or C to run shell scripts on the machine hosting runner X.
   %hr
-  - if @ci_project.shared_runners_enabled
-    = link_to toggle_shared_runners_ci_project_path(@ci_project), class: 'btn btn-warning', method: :post do
+  - if @project.shared_runners_enabled?
+    = link_to toggle_shared_runners_namespace_project_runners_path(@project.namespace, @project), class: 'btn btn-warning', method: :post do
       Disable shared runners
   - else
-    = link_to toggle_shared_runners_ci_project_path(@ci_project), class: 'btn btn-success', method: :post do
+    = link_to toggle_shared_runners_namespace_project_runners_path(@project.namespace, @project), class: 'btn btn-success', method: :post do
       Enable shared runners
   &nbsp; for this project
 
diff --git a/app/views/projects/runners/_specific_runners.html.haml b/app/views/projects/runners/_specific_runners.html.haml
index c13625c7e49..30cd1263a12 100644
--- a/app/views/projects/runners/_specific_runners.html.haml
+++ b/app/views/projects/runners/_specific_runners.html.haml
@@ -12,7 +12,7 @@
       %code #{ci_root_url(only_path: false)}
     %li
       Use the following registration token during setup:
-      %code #{@ci_project.token}
+      %code #{@project.runners_token}
     %li
       Start runner!
 
diff --git a/app/views/projects/triggers/index.html.haml b/app/views/projects/triggers/index.html.haml
index b3ad79a200e..bd346c4b8e6 100644
--- a/app/views/projects/triggers/index.html.haml
+++ b/app/views/projects/triggers/index.html.haml
@@ -36,7 +36,8 @@
     :plain
       curl -X POST \
            -F token=TOKEN \
-           #{ci_build_trigger_url(@ci_project.id, 'REF_NAME')}
+           -F ref=REF_NAME \
+           #{builds_trigger_url(@project.id)}
   %h3
     Use .gitlab-ci.yml
 
@@ -51,7 +52,7 @@
       trigger:
         type: deploy
         script:
-          - "curl -X POST -F token=TOKEN #{ci_build_trigger_url(@ci_project.id, 'REF_NAME')}"
+          - "curl -X POST -F token=TOKEN -F ref=REF_NAME #{builds_trigger_url(@project.id)}"
   %h3
     Pass build variables
 
@@ -65,5 +66,6 @@
     :plain
       curl -X POST \
            -F token=TOKEN \
+           -F "ref=REF_NAME" \
            -F "variables[RUN_NIGHTLY_BUILD]=true" \
-           #{ci_build_trigger_url(@ci_project.id, 'REF_NAME')}
+           #{builds_trigger_url(@project.id)}
diff --git a/app/views/projects/variables/show.html.haml b/app/views/projects/variables/show.html.haml
index e052da1ac43..e80dffc1ced 100644
--- a/app/views/projects/variables/show.html.haml
+++ b/app/views/projects/variables/show.html.haml
@@ -10,13 +10,13 @@
 %hr
 
 
-= nested_form_for @ci_project, url: url_for(controller: 'projects/variables', action: 'update'), html: { class: 'form-horizontal' }  do |f|
+= nested_form_for @project, url: url_for(controller: 'projects/variables', action: 'update'), html: { class: 'form-horizontal' }  do |f|
   - if @project.errors.any?
     #error_explanation
-      %p.lead= "#{pluralize(@ci_project.errors.count, "error")} prohibited this project from being saved:"
+      %p.lead= "#{pluralize(@project.errors.count, "error")} prohibited this project from being saved:"
       .alert.alert-error
         %ul
-          - @ci_project.errors.full_messages.each do |msg|
+          - @project.errors.full_messages.each do |msg|
             %li= msg
 
   = f.fields_for :variables do |variable_form|