delta/gitlab/gitlab-ce.git/app/services, branch feature/github-edit-path

Merge branch 'sh-prevent-duplicate-protected-branches-on-push' into 'master'

2016-09-19T15:36:57+00:00


Only create a protected branch upon a push to a new branch if a rule for that branch doesn't exist

A customer ran into an issue where a Sidekiq task retried over and over, leading to duplicate master branches in their protected branch list.
    
Closes #22177

See merge request !6399

Merge branch 'master' into per-build-token

2016-09-19T11:31:42+00:00

Merge branch 'review-apps' into 'master'

2016-09-19T11:22:51+00:00


Add support for dynamic environments

Implements proposal described in https://gitlab.com/gitlab-org/gitlab-ce/issues/21971.

Specifically:
- it adds a `.gitlab-ci.yml` configuration,
- it allows environment name to have slashes,
- it allows environment names to use CI predefined variables,
- it allows to specify URL from `.gitlab-ci.yml`,
- it allows the URL to use CI predefined variables,
- it introduces `environment_type` to allow to easily group environments in the future

See merge request !6323

Ensure validation messages are shown within the milestone form

2016-09-19T08:29:12+00:00

* Remove call to Milestone#save! instead just Milestone#save
* Add safety specs to stop a regression

Fixes #22033

Update support for dynamic environments

2016-09-19T08:07:13+00:00

Verify expandability of variables defined as part of environment

2016-09-19T08:07:13+00:00

Add support for dynamic environments

2016-09-19T08:05:35+00:00

Environments that can have a URL with predefined CI variables.

Only create a protected branch upon a push to a new branch if a rule for that branch doesn't exist

2016-09-18T03:36:07+00:00

A customer ran into an issue where a Sidekiq task retried over and over, leading to duplicate
master branches in their protected branch list.

Closes #22177

Improve code comments

2016-09-16T10:46:33+00:00

Rename capabilities to authentication_abilities

2016-09-16T09:12:21+00:00