• 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
pipelines.scss 11.3 KB