delta/gitlab/gitlab-ce.git/doc/user/project, branch docs-trigger-variable

Fix import/export labels to cope with project and group labels. Added relevant specs.

2016-10-19T16:58:25+00:00

Merge branch 'docs/clarify-new-ci-permissions-some-more' into 'master'

2016-10-14T09:08:51+00:00


Add more info on the new CI permissions model

From discussion in issue https://gitlab.com/gitlab-org/gitlab-ce/issues/22484

See merge request !6843

Refactor merge requests revisions

2016-10-14T08:25:11+00:00

- A system note now appears on every push
- Replace dashes with underscores in images

[ci skip]

Add link to update docs for source installations

2016-10-14T08:07:36+00:00

Merge branch 'feature/cycle-analytics-2-backend' into 'master'

2016-10-13T12:31:24+00:00


Implement second iteration of cycle analytics - Change in data measurement

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/22458

Measure everything that happened in the given time range, not only what's been pushed to production. With the exception of the staging and production stages.

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !6798

Add more info on the new CI permissions model

2016-10-13T07:30:18+00:00

[ci skip]

Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelines

2016-10-12T19:37:04+00:00

* master:
  Update health_check gem to `~> 2.2.0`
  API: Version information
  Revert "Merge branch 'tests-use-tmpfs' into 'master'"
  Added documentation chapter for Git attributes
  Use activerecord_sane_schema_dumper
  Add a separate stage for bundle check
  Add a bundle check step to ensure dependencies are correct
  Create a new /templates API namespace
  Add disabled delete button to protected branches
  Make spec deterministic
  refactors tests because of gitlab-test repository changes
  Addresses Robert's feedback
  Speed up specs for GET /projects/:id/events
  API: New /users/:id/events endpoint
  writes tests to verify the issue is solved and fixes breaking issues.
  removes inconsistency regarding tagging immediately as merged once you create a branch using new branch button and adds changelog entry

Added documentation chapter for Git attributes

2016-10-12T13:46:34+00:00

As discussed in https://gitlab.com/gitlab-org/gitlab_git/issues/28 we'll
need to clearly document the need for .gitattributes files being encoded
using UTF-8.

[ci skip]

Ignore deployment for statistics in Cycle Analytics, except in staging and production stages

2016-10-12T10:32:25+00:00

Also, updated specs and docs.

Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelines

2016-10-12T09:52:54+00:00

* master: (221 commits)
  Add CHANGELOG entry for 8.12.6
  Added 'Download' button to snippet view
  Merge branch 'api-fix-project-group-sharing' into 'security'
  Add 8.12.5, 8.11.9, and 8.10.12 CHANGELOG entries
  FIx JS bug with select2 because of missing `data-field` attribute in select box.
  Remove pointless `.vagrant_enabled` file
  allow multiple labels commands
  Move some CHANGELOG entries to the 8.13.0 part
  Move operations/ to new location
  Move health check docs under user/admin_area/monitoring
  Make guests unable to view MRs
  Add examples of fake tokens to be used in docs
  Remove duplicate CHANGELOG entry
  Allow browsing branches that end with '.atom'
  Refactor the SubGit/SVN documentation
  Document the new CI_DEBUG_TRACE variable
  Remove redundant images
  changed the scss for the top line connectors to be exactly centered
  Rearrange GitLab basics READMEs
  New images for GitLab basics "Create MR" docs
  ...

Conflicts:
  app/models/commit_status.rb