Jenkins tests

See merge request !19

Master CE to EE

See merge request !480

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

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

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

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

Merge branch 'jenkins_ci_status_handle_unstable_builds' of https://gitlab.com/chrisrohr/gitlab-ee into jenkins-tests

Adding in ability to check status of automatic branch jobs in jenkins

The current documentation for integrating Jenkins and Gitlab EE indicates that the Gitlab Hook Plugin should be used.  When you use that plugin you can set up Jenkins to automatically create new jobs for the branches used in merge requests.  The CI Status check for Jenkins does not currently handle those automatic jobs.  The result of this is shows an error checking the status on all Merge Requests.  This merge request is a small change to the jenkins_service to utilize the ref param being passed in and appending the branch name if not master to the project url which will allow the status checks to succeed.

See merge request !9

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

add CommitNote field expose :created_at

add CommitNote field expose :created_at

Make sure blog post MR has WIP keyword

cc @sytses @rspeicher

See merge request !1172

Fix path traversal in HelpController

Closes #2543

See merge request !1922

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

Add yellow/unstable build as a failure

Jenkins has more build statuses than any 'CI' tool I've ever seen. Apparently a build can be 'successful' but if tests fail it's called 'unstable'. However, 'unstable' is not considered a failing build. Bleh...

Anyway, GitLab needs to consider unstable or yellow builds a failure for CI purposes.

See merge request !11

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

Include more information in hook error messages

When pushing commits to the remote, if a pre-receive hook gets triggered that prevents the push, it may not be clear which commit is causing the issue. Having the values of what caused the comparison to fail in the error message will help debugging, whether it be the user or the administrator.

See merge request !14

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

Changed the EE license with the lawyers updates

See merge request !479

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

Make the `provider` argument for the LDAP group links API endpoint required

Related to #329

If no `provider` is passed to the API endpoint, the group link is not created properly. Making it required fixes the issue temporarily. It should default to the first provider.

Next step, as mentioned in #329, is to do that.

/cc @job

See merge request !475