From 6afd69f4445cc0688aa1695389eb3f79033e3121 Mon Sep 17 00:00:00 2001 From: Douwe Maan <douwe@gitlab.com> Date: Wed, 26 Aug 2015 17:47:18 -0700 Subject: [PATCH] Update gitignore, change literal DB table names, fix errors, fix fontawesome --- .gitignore | 3 +++ .../javascripts/ci/application.js.coffee | 2 +- app/assets/javascripts/ci/build.coffee | 2 +- app/assets/stylesheets/ci/generic/common.scss | 2 +- app/controllers/ci/runners_controller.rb | 2 +- app/helpers/ci/icons_helper.rb | 4 ++-- app/helpers/ci/runners_helper.rb | 4 ++-- app/models/ci/user.rb | 2 +- .../ci/admin/projects/_project.html.haml | 8 ++++---- app/views/ci/builds/_build.html.haml | 4 ++-- app/views/ci/builds/show.html.haml | 8 ++++---- app/views/ci/commits/show.html.haml | 2 +- app/views/ci/helps/show.html.haml | 8 ++++---- app/views/ci/lints/_create.html.haml | 4 ++-- app/views/ci/lints/show.html.haml | 2 +- app/views/ci/projects/_project.html.haml | 6 +++--- app/views/ci/projects/_search.html.haml | 2 +- app/views/ci/projects/gitlab.html.haml | 4 ++-- app/views/ci/projects/index.html.haml | 2 +- app/views/layouts/ci/_nav.html.haml | 4 ++-- app/views/layouts/ci/_nav_admin.html.haml | 10 +++++----- app/views/layouts/ci/_nav_project.html.haml | 20 +++++++++---------- app/views/layouts/ci/project.html.haml | 2 +- config/gitlab_ci.yml | 19 ------------------ config/secrets.yml | 3 --- lib/ci/charts.rb | 6 +++--- 26 files changed, 58 insertions(+), 77 deletions(-) delete mode 100644 config/gitlab_ci.yml delete mode 100644 config/secrets.yml diff --git a/.gitignore b/.gitignore index 8a68bb3e4f..aff8ad9ecb 100644 --- a/.gitignore +++ b/.gitignore @@ -20,12 +20,14 @@ backups/* config/aws.yml config/database.yml config/gitlab.yml +config/gitlab_ci.yml config/initializers/omniauth.rb config/initializers/rack_attack.rb config/initializers/smtp_settings.rb config/resque.yml config/unicorn.rb config/mail_room.yml +config/secrets.yml coverage/* db/*.sqlite3 db/*.sqlite3-journal @@ -41,3 +43,4 @@ rails_best_practices_output.html /tags tmp/ vendor/bundle/* +/ci/builds/* diff --git a/app/assets/javascripts/ci/application.js.coffee b/app/assets/javascripts/ci/application.js.coffee index 8a8aed1385..c2f7bfe977 100644 --- a/app/assets/javascripts/ci/application.js.coffee +++ b/app/assets/javascripts/ci/application.js.coffee @@ -41,7 +41,7 @@ $(document).on 'click', '.edit-runner-link', (event) -> descr.removeClass('hide') $(document).on 'click', '.assign-all-runner', -> - $(this).replaceWith('<i class="fa-refresh fa-spin"></i> Assign in progress..') + $(this).replaceWith('<i class="fa fa-refresh fa-spin"></i> Assign in progress..') window.unbindEvents = -> $(document).unbind('scroll') diff --git a/app/assets/javascripts/ci/build.coffee b/app/assets/javascripts/ci/build.coffee index be4a3aa757..c30859b484 100644 --- a/app/assets/javascripts/ci/build.coffee +++ b/app/assets/javascripts/ci/build.coffee @@ -29,7 +29,7 @@ class CiBuild success: (build) => if build.status == "running" $('#build-trace code').html build.trace_html - $('#build-trace code').append '<i class="fa-refresh fa-spin"/>' + $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>' @checkAutoscroll() else Turbolinks.visit build_url diff --git a/app/assets/stylesheets/ci/generic/common.scss b/app/assets/stylesheets/ci/generic/common.scss index 58b7a93b0a..8b0d59fdb7 100644 --- a/app/assets/stylesheets/ci/generic/common.scss +++ b/app/assets/stylesheets/ci/generic/common.scss @@ -122,7 +122,7 @@ ul.bordered-list { color: #888; text-shadow: 0 1px 1px #fff; } - i[class^="fa-"] { + i.fa { line-height: 14px; } } diff --git a/app/controllers/ci/runners_controller.rb b/app/controllers/ci/runners_controller.rb index 01eebf7e6a..0ef32ce928 100644 --- a/app/controllers/ci/runners_controller.rb +++ b/app/controllers/ci/runners_controller.rb @@ -11,7 +11,7 @@ module Ci def index @runners = @project.runners.order('id DESC') @specific_runners = current_user.authorized_runners. - where.not(id: @runners).order('runners.id DESC').page(params[:page]).per(20) + where.not(id: @runners).order("#{Ci::Runner.table_name}.id DESC").page(params[:page]).per(20) @shared_runners = Ci::Runner.shared.active @shared_runners_count = @shared_runners.count(:all) end diff --git a/app/helpers/ci/icons_helper.rb b/app/helpers/ci/icons_helper.rb index ecb6ef7be4..be40f79e88 100644 --- a/app/helpers/ci/icons_helper.rb +++ b/app/helpers/ci/icons_helper.rb @@ -2,9 +2,9 @@ module Ci module IconsHelper def boolean_to_icon(value) if value.to_s == "true" - content_tag :i, nil, class: 'fa-circle cgreen' + content_tag :i, nil, class: 'fa fa-circle cgreen' else - content_tag :i, nil, class: 'fa-power-off clgray' + content_tag :i, nil, class: 'fa fa-power-off clgray' end end end diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb index 782208ddfe..03c9914641 100644 --- a/app/helpers/ci/runners_helper.rb +++ b/app/helpers/ci/runners_helper.rb @@ -3,7 +3,7 @@ module Ci def runner_status_icon(runner) unless runner.contacted_at return content_tag :i, nil, - class: "fa-warning-sign", + class: "fa fa-warning-sign", title: "New runner. Has not connected yet" end @@ -15,7 +15,7 @@ module Ci end content_tag :i, nil, - class: "fa-circle runner-status-#{status}", + class: "fa fa-circle runner-status-#{status}", title: "Runner is #{status}, last contact was #{time_ago_in_words(runner.contacted_at)} ago" end end diff --git a/app/models/ci/user.rb b/app/models/ci/user.rb index 7456bd1a77..49ec7126fc 100644 --- a/app/models/ci/user.rb +++ b/app/models/ci/user.rb @@ -68,7 +68,7 @@ module Ci def authorized_runners Ci::Runner.specific.includes(:runner_projects). - where(runner_projects: { project_id: authorized_projects } ) + where(Ci::RunnerProject.table_name => { project_id: authorized_projects } ) end def authorized_projects diff --git a/app/views/ci/admin/projects/_project.html.haml b/app/views/ci/admin/projects/_project.html.haml index e64bfe853d..505dd4b3fd 100644 --- a/app/views/ci/admin/projects/_project.html.haml +++ b/app/views/ci/admin/projects/_project.html.haml @@ -3,7 +3,7 @@ %td = project.id %td - = link_to project do + = link_to [:ci, project] do %strong= project.name %td - if last_commit @@ -15,14 +15,14 @@ No builds yet %td - if project.public - %i.fa-globe + %i.fa.fa-globe Public - else - %i.fa-lock + %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-remove + %i.fa.fa-remove Remove diff --git a/app/views/ci/builds/_build.html.haml b/app/views/ci/builds/_build.html.haml index ff9fdbbcb4..54ca1102b5 100644 --- a/app/views/ci/builds/_build.html.haml +++ b/app/views/ci/builds/_build.html.haml @@ -39,7 +39,7 @@ .pull-right - if build.active? = link_to cancel_ci_project_build_path(build.project, build, return_to: request.original_url), title: 'Cancel build' do - %i.fa-remove.cred + %i.fa.fa-remove.cred - elsif build.commands.present? = link_to retry_ci_project_build_path(build.project, build, return_to: request.original_url), method: :post, title: 'Retry build' do - %i.fa-repeat + %i.fa.fa-repeat diff --git a/app/views/ci/builds/show.html.haml b/app/views/ci/builds/show.html.haml index fed30847e7..0bef67d8a2 100644 --- a/app/views/ci/builds/show.html.haml +++ b/app/views/ci/builds/show.html.haml @@ -25,7 +25,7 @@ %a Build ##{@build.id} · - %i.fa-warning-sign + %i.fa.fa-warning-sign This build was retried. .row @@ -46,7 +46,7 @@ - if @build.duration .pull-right %span - %i.fa-time + %i.fa.fa-time #{duration_in_words(@build.finished_at, @build.started_at)} .clearfix @@ -63,9 +63,9 @@ .clearfix .scroll-controls = link_to '#up-build-trace', class: 'btn' do - %i.fa-angle-up + %i.fa.fa-angle-up = link_to '#down-build-trace', class: 'btn' do - %i.fa-angle-down + %i.fa.fa-angle-down %pre.trace#build-trace %code.bash diff --git a/app/views/ci/commits/show.html.haml b/app/views/ci/commits/show.html.haml index 4cf567c77e..832cc6a1ba 100644 --- a/app/views/ci/commits/show.html.haml +++ b/app/views/ci/commits/show.html.haml @@ -60,7 +60,7 @@ Builds - if @commit.duration > 0 %small.pull-right - %i.fa-time + %i.fa.fa-time #{time_interval_in_words @commit.duration} %table.builds diff --git a/app/views/ci/helps/show.html.haml b/app/views/ci/helps/show.html.haml index 5acdf9fa98..9b32d529c6 100644 --- a/app/views/ci/helps/show.html.haml +++ b/app/views/ci/helps/show.html.haml @@ -14,27 +14,27 @@ .bs-callout.bs-callout-success %h4 = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/api' do - %i.fa-cogs + %i.fa.fa-cogs API %p Explore how you can access GitLab CI via the API. .bs-callout.bs-callout-info %h4 = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/tree/master/doc/examples' do - %i.fa-info-sign + %i.fa.fa-info-sign Build script examples %p This includes the build script we use to test GitLab CE. .bs-callout.bs-callout-danger %h4 = link_to 'https://gitlab.com/gitlab-org/gitlab-ci/issues' do - %i.fa-bug + %i.fa.fa-bug Issue tracker %p Reports about recent bugs and problems.. .bs-callout.bs-callout-warning %h4 = link_to 'http://feedback.gitlab.com/forums/176466-general/category/64310-gitlab-ci' do - %i.fa-thumbs-up + %i.fa.fa-thumbs-up Feedback forum %p Suggest improvements or new features for GitLab CI. diff --git a/app/views/ci/lints/_create.html.haml b/app/views/ci/lints/_create.html.haml index 903b92de68..e2179e60f3 100644 --- a/app/views/ci/lints/_create.html.haml +++ b/app/views/ci/lints/_create.html.haml @@ -2,7 +2,7 @@ %p %b Status: syntax is correct - %i.fa-ok.correct-syntax + %i.fa.fa-ok.correct-syntax %table.table.table-bordered %thead @@ -32,7 +32,7 @@ %p %b Status: syntax is incorrect - %i.fa-remove.incorrect-syntax + %i.fa.fa-remove.incorrect-syntax %b Error: = @error diff --git a/app/views/ci/lints/show.html.haml b/app/views/ci/lints/show.html.haml index b0fd5dd8e5..a9b954771c 100644 --- a/app/views/ci/lints/show.html.haml +++ b/app/views/ci/lints/show.html.haml @@ -13,7 +13,7 @@ %p.text-center.loading - %i.fa-refresh.fa-spin + %i.fa.fa-refresh.fa-spin .results.prepend-top-20 diff --git a/app/views/ci/projects/_project.html.haml b/app/views/ci/projects/_project.html.haml index 3e893410df..b3ad47ce43 100644 --- a/app/views/ci/projects/_project.html.haml +++ b/app/views/ci/projects/_project.html.haml @@ -1,7 +1,7 @@ - last_commit = project.last_commit %tr.alert{class: commit_status_alert_class(last_commit) } %td - = link_to project do + = link_to [:ci, project] do %strong= project.name %td - if last_commit @@ -13,10 +13,10 @@ No builds yet %td - if project.public - %i.fa-globe + %i.fa.fa-globe Public - else - %i.fa-lock + %i.fa.fa-lock Private %td = project.commits.count diff --git a/app/views/ci/projects/_search.html.haml b/app/views/ci/projects/_search.html.haml index 37fb804d8d..e65aaa3870 100644 --- a/app/views/ci/projects/_search.html.haml +++ b/app/views/ci/projects/_search.html.haml @@ -4,7 +4,7 @@ .input-group = search_field_tag "search", params[:search], placeholder: "Search", class: "search-input form-control" .input-group-addon - %i.fa-search + %i.fa.fa-search :coffeescript diff --git a/app/views/ci/projects/gitlab.html.haml b/app/views/ci/projects/gitlab.html.haml index dbc0ea0880..bd55b1f12e 100644 --- a/app/views/ci/projects/gitlab.html.haml +++ b/app/views/ci/projects/gitlab.html.haml @@ -6,7 +6,7 @@ by keyword: "#{params[:search]}", #{time_ago_in_words(current_user.sync_at)} ago. = link_to gitlab_ci_projects_path(reset_cache: true, search: params[:search]), class: 'sync-now btn btn-sm btn-default reset-cache' do - %i.fa-refresh + %i.fa.fa-refresh Sync now %br @@ -27,7 +27,7 @@ = render "gl_projects" %p.text-center.hide.loading - %i.fa-refresh.fa-spin + %i.fa.fa-refresh.fa-spin - else = render @projects diff --git a/app/views/ci/projects/index.html.haml b/app/views/ci/projects/index.html.haml index 6243a28f9e..69b6c8b4d6 100644 --- a/app/views/ci/projects/index.html.haml +++ b/app/views/ci/projects/index.html.haml @@ -7,7 +7,7 @@ .projects %p.fetch-status.light - %i.fa-refresh.fa-spin + %i.fa.fa-refresh.fa-spin Please wait while we fetch from GitLab (#{GitlabCi.config.gitlab_server.url}) :coffeescript $.get '#{gitlab_ci_projects_path}', (data) -> diff --git a/app/views/layouts/ci/_nav.html.haml b/app/views/layouts/ci/_nav.html.haml index 4e944d4d0d..babd14ca2d 100644 --- a/app/views/layouts/ci/_nav.html.haml +++ b/app/views/layouts/ci/_nav.html.haml @@ -3,7 +3,7 @@ .navbar-header %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"} %span.sr-only Toggle navigation - %i.fa-reorder + %i.fa.fa-reorder = link_to 'GitLab CI', ci_root_path, class: "navbar-brand" @@ -25,7 +25,7 @@ %span= current_user.name %li = link_to ci_user_sessions_path, class: "logout", method: :delete do - %i.fa-signout + %i.fa.fa-signout Logout - else %li diff --git a/app/views/layouts/ci/_nav_admin.html.haml b/app/views/layouts/ci/_nav_admin.html.haml index 792a5f1e4d..ae58f15554 100644 --- a/app/views/layouts/ci/_nav_admin.html.haml +++ b/app/views/layouts/ci/_nav_admin.html.haml @@ -1,21 +1,21 @@ %ul.nav.nav-pills.nav-stacked.admin-menu = nav_link path: 'projects' do = link_to ci_admin_projects_path do - %i.fa-list-alt + %i.fa.fa-list-alt Projects = nav_link path: 'events' do = link_to ci_admin_events_path do - %i.fa-book + %i.fa.fa-book Events = nav_link path: 'runners#index' do = link_to ci_admin_runners_path do - %i.fa-cog + %i.fa.fa-cog Runners %small.pull-right = Ci::Runner.count(:all) = nav_link path: 'builds' do = link_to ci_admin_builds_path do - %i.fa-link + %i.fa.fa-link Builds %small.pull-right = Ci::Build.count(:all) @@ -23,6 +23,6 @@ %hr = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do = link_to ci_admin_application_settings_path do - %i.fa-cogs + %i.fa.fa-cogs %span Settings diff --git a/app/views/layouts/ci/_nav_project.html.haml b/app/views/layouts/ci/_nav_project.html.haml index 24ee1609d2..d5b66b92fe 100644 --- a/app/views/layouts/ci/_nav_project.html.haml +++ b/app/views/layouts/ci/_nav_project.html.haml @@ -1,40 +1,40 @@ %ul.nav.nav-pills.nav-stacked.project-menu = nav_link path: 'projects#show' do = link_to ci_project_path(@project) do - %i.fa-list-alt + %i.fa.fa-list-alt Commits %small.pull-right= @project.commits.count = nav_link path: 'charts#show' do = link_to ci_project_charts_path(@project) do - %i.fa-bar-chart + %i.fa.fa-bar-chart Charts = nav_link path: ['runners#index', 'runners#show'] do = link_to ci_project_runners_path(@project) do - %i.fa-cog + %i.fa.fa-cog Runners - = nav_link path: 'variables#index' do + = nav_link path: 'variables#show' do = link_to ci_project_variables_path(@project) do - %i.fa-code + %i.fa.fa-code Variables = nav_link path: 'web_hooks#index' do = link_to ci_project_web_hooks_path(@project) do - %i.fa-link + %i.fa.fa-link Web Hooks = nav_link path: 'triggers#index' do = link_to ci_project_triggers_path(@project) do - %i.fa-retweet + %i.fa.fa-retweet Triggers = nav_link path: 'services#index' do = link_to ci_project_services_path(@project) do - %i.fa-share + %i.fa.fa-share Services = nav_link path: 'events#index' do = link_to ci_project_events_path(@project) do - %i.fa-book + %i.fa.fa-book Events %li %hr = nav_link path: 'projects#edit' do = link_to edit_ci_project_path(@project) do - %i.fa-cogs + %i.fa.fa-cogs Settings diff --git a/app/views/layouts/ci/project.html.haml b/app/views/layouts/ci/project.html.haml index d0c0861669..763a7fc0b0 100644 --- a/app/views/layouts/ci/project.html.haml +++ b/app/views/layouts/ci/project.html.haml @@ -9,7 +9,7 @@ = @project.name - if @project.public %small - %i.fa-globe + %i.fa.fa-globe Public .pull-right diff --git a/config/gitlab_ci.yml b/config/gitlab_ci.yml deleted file mode 100644 index 03a86307f4..0000000000 --- a/config/gitlab_ci.yml +++ /dev/null @@ -1,19 +0,0 @@ -development: - gitlab_server: - url: 'http://gitlab.dev' - app_id: 'cfda7ec2551af42d06acc6dbda9087dbdc8d45b7e2bc240f498fad3f84ff4044' - app_secret: 'd1802d55db9c1aedc950812a9489e2659fa1430dc488babde949bc9c409cc01b' - - gitlab_ci: - host: 'http://ci.gitlab.dev' - port: 80 - https: false -test: - gitlab_server: - url: 'http://demo.gitlab.com/' - app_id: '' - app_secret: '' - gitlab_ci: - host: localhost - port: 80 - https: false diff --git a/config/secrets.yml b/config/secrets.yml deleted file mode 100644 index f63c74d068..0000000000 --- a/config/secrets.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -development: - db_key_base: 53ab5c413f37a5a87df3c7e55dc49924793c44b9a40834af258f75ce3cc71067478b7c1f999bf22d9cfb9e6dedffda989dc462684f8c869705f735a92b7230ed diff --git a/lib/ci/charts.rb b/lib/ci/charts.rb index e50a7a59c2..915a4f526a 100644 --- a/lib/ci/charts.rb +++ b/lib/ci/charts.rb @@ -17,10 +17,10 @@ module Ci def push(from, to, format) @labels << from.strftime(format) @total << project.builds. - where('? > builds.created_at AND builds.created_at > ?', to, from). + where("? > #{Ci::Build.table_name}.created_at AND #{Ci::Build.table_name}.created_at > ?", to, from). count(:all) @success << project.builds. - where('? > builds.created_at AND builds.created_at > ?', to, from). + where("? > #{Ci::Build.table_name}.created_at AND #{Ci::Build.table_name}.created_at > ?", to, from). success.count(:all) end end @@ -60,7 +60,7 @@ module Ci class BuildTime < Chart def collect - commits = project.commits.joins(:builds).where('builds.finished_at is NOT NULL AND builds.started_at is NOT NULL').last(30) + commits = project.commits.joins(:builds).where("#{Ci::Build.table_name}.finished_at is NOT NULL AND #{Ci::Build.table_name}.started_at is NOT NULL").last(30) commits.each do |commit| @labels << commit.short_sha @build_times << (commit.duration / 60) -- 2.30.9