delta/gitlab/gitlab-ce.git/spec/features, branch feature/github-edit-path

Merge remote-tracking branch 'upstream/master' into fix-download-artifacts-button-link

2016-09-20T06:10:48+00:00

* upstream/master: (80 commits)
  Contributing via GH no longer encouraged.
  Update README.md to really fix icon
  Update README.md to fix icon
  Allow to set request_access_enabled for groups and projects using API
  Restrict last_activity_at updates to one per hour
  Solve code review comments
  Properly support Gitlab::Auth::Result
  Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
  Move Gitlab::Auth.Result to separate file
  Added CHANGELOG
  Fix spec failures
  Support pushing via SSH
  Fix specs failures
  Don't leak build tokens in build logs
  Fix permissions for creating container images
  Fix old CHANGELOG entries
  Add linting for duplicate CHANGELOG versions (!6039)
  Ensure validation messages are shown within the milestone form
  Fix validation regexs (+1 squashed commit) Squashed commits: [f9a9315] Use : to test invalid environment name
  Fix scope of the CI config key nodes in jobs entry
  ...

Merge branch 'master' into '21961-issues-filtering-issue-with-labels-that-contain-spaces'

2016-09-19T19:33:23+00:00

# Conflicts:
#   app/assets/javascripts/gl_dropdown.js

Merge branch 'fix/import-export-db-errors' into 'master'

2016-09-19T13:02:49+00:00


Fix import/export database errors

Fixes protected branches errors when importing a project including them

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21295

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21799

See merge request !6099

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

Merge remote-tracking branch 'upstream/master' into fix-download-artifacts-button-link

2016-09-19T09:52:22+00:00

* upstream/master:
  Reset pushes_since_gc counter before specs run to ensure starting point is 0
  Add missing spec for ProtectedBranches::CreateService
  Refactor boards_spec.rb to avoid code duplication
  Render invalid template for merge requests without source project and open

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

Fix validation regexs (+1 squashed commit)

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

Squashed commits:
[f9a9315] Use : to test invalid environment name

squashed - Fix DB exceptions raised importing some specific projects.

2016-09-19T07:18:37+00:00

Better import of labels, milestones and protected branches. Updated relevant specs.
Loose pipeline validation on importing, so it does not fail when there are missing fields, which are not validated at DB level. Also, updated spec with relevant test.

Fix download artifacts button link:

2016-09-19T05:12:45+00:00

Rails ignored unused arguments and ref_name_and_path is the last
path argument, therefore we need to concatenate that parts ourselves.

Otherwise, 'download' won't be shown at all.

Refactor boards_spec.rb to avoid code duplication

2016-09-17T05:16:49+00:00

Originally created to address #21197, but !6224 solved the intermittent spec
failures.