(cherry picked from commit 77e508d8)

The change in baa15792 broke backup
restore fucnctionality. This would not lead to data loss, but it
prevented the restore script from working. This bug exists only in
7.14.0 release candidate versions, not in 7.13.

Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 .

Closes #2305

Fix infinite loop when SAML was incorrectly configured.

See merge request !1170

Fix gitlab:env:info rake task.

Found doing QA.

See merge request !1169

Clear cache to prevent listing deleted branches after MR removes source branch

Closes #2272

See merge request !1160

disallow irrelevant pages by defaults in robots

capitalize URL in "Home page URL"

Update default robots.txt rules to disallow irrelevant pages that search
engines should not care about. This will still allow important pages
like the files, commit details, merge requests, issues, comments, etc.
to be crawled.

Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules

Closes #2262

See merge request !1171

Closes #2262

Remove the `gfm_with_options` helper

It was redundant because `gfm` also took options.

See merge request !1152

Fix bug where backslashes in inline diffs could be dropped

This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input:

```
input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip
```

The second backslash is dropped in the second `sub` statement:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png)

With this fix, it looks like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png)

Closes #2253

See merge request !1143

Improve error message display when project fails to import

Follow-up to !1134.

New screenshot:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/c1a8ffa30ab3b78010e16cf65c2ff438/image.png)

See merge request !1138

Revert "Fix for #9527"

Installation and update guides for 7.14

cc @rspeicher

See merge request !1168

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Require Ruby 2.1.0 in `gitlab:app:check` task

See merge request !1165

[ci skip]

Update changelog for MR !1124

@dzaporozhets

See merge request !1164

Signed-off-by: Sven Strickroth <email@cs-ware.de>

Bump omniauth-saml to 1.4.1

Updates a vulnerable `ruby-saml` dependency.

- https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448
- https://github.com/onelogin/ruby-saml/pull/247

See merge request !1162

Updates a vulnerable `ruby-saml` dependency.

- https://github.com/onelogin/ruby-saml/commit/9853651b96b99653ea8627d757d46bfe62ab6448
- https://github.com/onelogin/ruby-saml/pull/247

Fix redirection after sign in when using auto_sign_in_with_provider

Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control.

See merge request !1146

Workaround the insecure password warnings emitted by MySQL 5.6

When using MySQL 5.6, the following output is emitted every time a backup is created, even with CRON=1.

```
Warning: Using a password on the command line interface can be insecure.
```

This fix works around that by sending the password via the [`MYSQL_PWD`](http://dev.mysql.com/doc/refman/5.6/en/environment-variables.html) environment variable.

See merge request !1139

Fix for #9527

Update Flowdock integration to support new Flowdock API

Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.