delta/gitlab/gitlab-ce.git, branch diff-options

Spec fixes for removed UI elements.

2016-07-21T16:55:16+00:00

Added CHANGELOG.

2016-07-21T16:55:16+00:00

Unify diff option buttons.

2016-07-21T16:55:16+00:00

Merge branch 'fix-has-external-wiki-migration' into 'master'

2016-07-21T16:24:38+00:00


Don't drop in DropAndReaddHasExternalWikiInProjects

## What does this MR do?

This MR fixes the migration in question so it doesn't first drop and then re-add a column.

## Are there points in the code the reviewer needs to double check?

Not really.

## Why was this MR needed?

The old migration could lead to application errors as the column would temporarily not exist between the drop column and add column statements.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-com/infrastructure/issues/239

## Does this MR meet the acceptance criteria?

- [x] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5402

Merge branch 'document-allow_failure-keyword' into 'master'

2016-07-21T16:24:07+00:00


Add allow_failure CI documentation

## What does this MR do?

Adds documentation for the `allow_failure` keyword for the CI.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17669

See merge request !5398

Don't drop in DropAndReaddHasExternalWikiInProjects

2016-07-21T15:43:43+00:00

Dropping a column and then re-adding it can lead to the application
throwing errors as the column may temporarily not exist. To work around
this we'll reset the various project rows in batches _without_ removing
any columns.

Merge branch '20079-new-wiki-page-500' into 'master'

2016-07-21T14:57:31+00:00


Don't use `params[:id]` while building `markdown_preview_path`.

- Closes #20079

See merge request !5400

Add allow_failure CI documentation

2016-07-21T12:37:32+00:00

Don't use `params[:id]` while building `markdown_preview_path`.

2016-07-21T12:16:33+00:00

1. Instead, use `@page.title`, since it's always guaranteed to be around
   in a wiki.

2. `params[:id]` is _not_ always guaranteed to be around - if a page is
    created with errors, `render :edit` is called, and `params[:id]` is
    `nil`.

3. More context: https://gitlab.com/gitlab-org/gitlab-ce/issues/20079#note_13223240

Merge branch 'fix-migration-introduced-by-5387' into 'master'

2016-07-21T11:36:06+00:00


Fix migration to make it fast

## What does this MR do?

Changing the migration introduced in !5387 so that it's fast. The idea is that the content of the `projects.has_external_wiki` is currently wrong, so we can just drop and recreate the column.

## Does this MR meet the acceptance criteria?

- [x] No CHANGELOG needed
- Tests
  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5394