delta/gitlab/gitlab-ce.git/config, branch remove-flaky-diff-note-tests

Merge branch '15343-build-settiings' into 'master'

2016-07-20T13:59:43+00:00


Resolve "Move Build badges settings to Builds page (or Builds settings)"

## What does this MR do?
Removes pipeline settings section from project settings & creates a new pipelines settings page    
Adds builds badge to pipelines settings page & removes badge page

## Are there points in the code the reviewer needs to double check?
All Rails updates -> particularly `builds_controller.rb` and `routes`   
Spacing needs to be updated across all settings pages and will be in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/issues/19827)

## What are the relevant issue numbers?
Closes #15343    
Part of #18920 

## Screenshots (if relevant)
![Screen_Shot_2016-07-19_at_5.47.29_AM](/uploads/48e6d203de4cbe0b697280128695d980/Screen_Shot_2016-07-19_at_5.47.29_AM.png)
![Screen_Shot_2016-07-14_at_9.25.13_AM](/uploads/59118440f3e7bb903f44260abb119376/Screen_Shot_2016-07-14_at_9.25.13_AM.png)

See merge request !5244

Create PipelinesSettingsController for showing settings page

2016-07-20T12:39:06+00:00

Merge branch 'rename-js-files' into 'master'

2016-07-20T12:26:53+00:00


Replace namespace-specific application.js files with namespace-bundle.js files.

Following up on the per-page JavaScript improvements, I wanted to replace the use of `application.js` with `namespace-bundle.js` to prevent confusion when downloading more than one application.js file.

This is pretty much just for the sake of clarity.

cc: @alfredo1 

See merge request !5221

Update routes

2016-07-20T11:59:20+00:00

Log cron_jobs configuration instead of raising exception

2016-07-20T10:50:42+00:00

Fix the Sentry spam from CSP violations by disabling it.

2016-07-20T04:29:15+00:00

Merge remote-tracking branch 'origin/master' into 15343-build-settiings

2016-07-19T22:20:41+00:00

Move Pipelines settings under `gitlab.com/gitlab-org/gitlab-ce/pipelines/settings`

2016-07-19T21:26:13+00:00

Fix help page paths to make sure shortcuts and the UI help page work.

2016-07-19T17:17:14+00:00

Add a test to make sure the help page UI path doesn't break in the future.

Fix #19972 and #19889.

Merge branch 'manual-actions' into 'master'

2016-07-19T12:49:54+00:00


Add support for manual CI actions

## What does this MR do?
This implements a `when: manual` which allows a jobs to be marked as manual actions.
Manual actions have to be explicitly executed by developers.

## What are the relevant issue numbers?
This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010

See merge request !5297