• Grzegorz Bizon's avatar
    Merge branch 'master' into auto-pipelines-vue · 3deaf134
    Grzegorz Bizon authored
    * master: (367 commits)
      Set “Remove branch” button to default size
      remove unused helper method
      reduce common code even further to satisfy rake flay
      remove button class size alteration from revert and cherry pick links
      factor out common code to satisfy rake flay
      homogenize revert and cherry-pick button styles generated by commits_helper
      apply margin on alert banners only when there is one or more alerts
      Rename MattermostNotificationService back to MattermostService
      Rename SlackNotificationService back to SlackService
      Fix stage and pipeline specs and rubocop offenses
      Added QueryRecorder to test N+1 fix on Milestone#show
      Use gitlab-workhorse 1.2.1
      Make 'unmarked as WIP' message more consistent
      Improve specs for Files API
      Allow unauthenticated access to Repositories Files API GET endpoints
      Add isolated view spec for pipeline stage partial
      Move test for HTML stage endpoint to controller specs
      Fix sizing of avatar circles; add border
      Fix broken test
      Fix broken test Changes after review
      ...
    
    Conflicts:
    	app/assets/stylesheets/pages/pipelines.scss
    	app/controllers/projects/pipelines_controller.rb
    	app/views/projects/pipelines/index.html.haml
    	spec/features/projects/pipelines/pipelines_spec.rb
    3deaf134
pipelines.scss 14.5 KB