1. 14 Dec, 2016 9 commits
    • Grzegorz Bizon's avatar
      Merge branch 'master' into 22604-manual-actions · 7217a19e
      Grzegorz Bizon authored
      * master: (151 commits)
        Improve build status specs contexts descriptions
        Add some missing tests for detailed status methods
        Fix wrong error message expectation in API::Commits spec
        Remove trailing blank line from Allowable module
        Move admin settings spinach feature to rspec
        Encode when migrating ProcessCommitWorker jobs
        Prevent overflow with vertical scroll when we have space to show content
        Make rubocop happy
        API: Ability to cherry-pick a commit
        Be smarter when finding a sudoed user in API::Helpers
        Update manual build icon SVG
        Make it possible to mix `Gitlab::Routing` in
        Backport hooks on group policies for the EE-specific implementation
        Extract abilities checking module from ability model
        Extend tests for pipeline detailed status helpers
        Add tests for common build detailed status helpers
        Add missing tests for build `cancelable?` method
        Add tests for detailed build statuses factory
        Make it possible to retry build that was canceled
        Make build retryable only if complete and executed
        ...
      
      Conflicts:
      	app/assets/stylesheets/pages/pipelines.scss
      	app/models/ci/build.rb
      	app/models/ci/pipeline.rb
      	app/models/ci/stage.rb
      	app/models/commit_status.rb
      	app/views/admin/runners/show.html.haml
      	app/views/projects/builds/_header.html.haml
      	app/views/projects/ci/builds/_build.html.haml
      	app/views/projects/ci/builds/_build_pipeline.html.haml
      	app/views/projects/ci/pipelines/_pipeline.html.haml
      	app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
      	app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
      	app/views/projects/pipelines/_info.html.haml
      	lib/gitlab/ci/status/build/common.rb
      	lib/gitlab/ci/status/build/play.rb
      	lib/gitlab/ci/status/build/stop.rb
      	lib/gitlab/ci/status/core.rb
      	spec/lib/gitlab/ci/status/pipeline/common_spec.rb
      7217a19e
    • Rémy Coutable's avatar
      Merge branch 'build-statuses' into 'master' · 3e90aa11
      Rémy Coutable authored
      Detailed build statuses
      
      ## What does this MR do?
      
      Implements detailed statuses for `Ci::Builds` and `CommitStatus`.
      
      It also adds a new icon for manual build.
      
      ## Screenshots
      
      ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png)
      
      ## What are the relevant issue numbers?
      
      See #24273, closes #22642
      
      See merge request !7989
      3e90aa11
    • Rémy Coutable's avatar
      Merge branch '25651-fix-master' into 'master' · 3a906126
      Rémy Coutable authored
      Fix wrong error message expectation in API::Commits spec
      
      See commit message or https://gitlab.com/gitlab-org/gitlab-ce/issues/25651#note_19996076 for the explanation.
      
      Closes #25651
      
      See merge request !8083
      3a906126
    • Grzegorz Bizon's avatar
      6757aaa1
    • Rémy Coutable's avatar
      Merge branch 'process-commit-worker-migration-encoding' into 'master' · 78f89f7a
      Rémy Coutable authored
      Encode when migrating ProcessCommitWorker jobs
      
      ## What does this MR do?
      
      This adds encoding logic to the migration for ProcessCommitWorker, ensuring it doesn't throw errors when the input can not be converted to UTF-8 without extra help.
      
      ## What are the relevant issue numbers?
      
      https://gitlab.com/gitlab-org/gitlab-ce/issues/25489
      
      See merge request !8064
      78f89f7a
    • Grzegorz Bizon's avatar
      ac115a9e
    • Grzegorz Bizon's avatar
      Merge branch '25136-last-deployment-link' into 'master' · c6d77859
      Grzegorz Bizon authored
      Fix broken link for latest deployment
      
      ## What does this MR do?
      
      Creates a new helper for the latest deployment link.
      
      ## Why was this MR needed?
      
      A helper that returns a link was being called inside another helper that creates a link, resulting in  `builds/<a href="builds/ID>#id</a>`
      
      ## What are the relevant issue numbers?
      
      Closes #25136
      
      See merge request !7839
      c6d77859
    • Rémy Coutable's avatar
      Fix wrong error message expectation in API::Commits spec · de038bf7
      Rémy Coutable authored
      This was because the MR was a bit behind master and the error message
      got updated in the meantime by 79aad815.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      de038bf7
    • Grzegorz Bizon's avatar
      309580bd
  2. 13 Dec, 2016 31 commits