delta/gitlab/gitlab-ce.git, branch issue_5541

Allow enabling and disabling commit and MR events for JIRA

2016-11-18T17:17:51+00:00

Merge branch '24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-to-fail' into 'master'

2016-11-18T16:55:41+00:00


Resolve "spec/lib/gitlab/backend/shell_spec.rb causes other specs to fail"

## What does this MR do?

It ensures we rely on `Gitlab::Shell`'s public API and not on its internal. Since `Gitlab::Shell` is caching the value of its token, the only way to get the correct token is to call `Gitlab::Shell.secret_token`, not to read the `Gitlab.config.gitlab_shell.secret_file` file!

Fixes #24599

See merge request !7557

Merge branch 'docs/no-artifacts-passing' into 'master'

2016-11-18T16:15:06+00:00


Document how to prevent artifacts from passing to next stage

See merge request !7575

Document how to prevent artifacts from passing to next stage

2016-11-18T16:10:09+00:00

[ci skip]

Merge branch '24617-skipped-icon-title' into 'master'

2016-11-18T16:03:10+00:00


Remove title from skipped status svg

Closes #24617

See merge request !7570

Merge branch 'jasperdenkers/gitlab-ce-ci-play-heroku-example' into 'master'

2016-11-18T16:02:44+00:00


Add CI example for Play/Scala apps with deployment to Heroku

Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3204

See merge request !7574

Merge the two Scala examples

2016-11-18T16:01:28+00:00

[ci skip]

Merge branch '23205-information-about-environments-build-page' into 'master'

2016-11-18T15:49:19+00:00


Add environment info to builds page

![Screen_Shot_2016-11-02_at_5.44.01_PM](/uploads/3443d9518997147d1e6f41830e3774ff/Screen_Shot_2016-11-02_at_5.44.01_PM.png)

Closes #23205

See merge request !7251

Merge branch 'pass-correct-tag-target-to-post-receive' into 'master'

2016-11-18T15:49:07+00:00


Pass correct tag target to post-receive hook when creating tag via UI

Fixes #24437

See merge request !7556

Add Play/Scala CI example with deployment to Heroku

2016-11-18T15:42:51+00:00