delta/gitlab/gitlab-ce.git/Gemfile, branch docs-trigger-variable

Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support for IdP auto-configuration.

2016-10-19T15:40:25+00:00

Enable activerecord_sane_schema_dumper for test

2016-10-17T15:10:37+00:00

Merge branch 'rs-loosen-request_store' into 'master'

2016-10-13T14:22:53+00:00


Loosen requirement on request_store version

This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868

See merge request !6853

Loosen requirement on request_store version

2016-10-13T13:02:05+00:00

This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868

Updated gitlab-markup forked gem to download from rubygems

2016-10-13T11:49:11+00:00

Use forked github-markup gem to enable python3 support with omnibus

2016-10-13T11:45:05+00:00

Merge branch 'dz-improve-mr-compar' into 'master'

2016-10-12T19:54:22+00:00


Improve merge request versions compare logic

## What does this MR do?

Changes the way how we compare between for merge request versions 

## Are there points in the code the reviewer needs to double check?

no 

## Why was this MR needed?

So when I squash+rebase my commit I can get more accurate diff on what changed between versions

## Screenshots (if relevant)

in discussion (below)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- 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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/22368, https://gitlab.com/gitlab-org/gitlab-ce/issues/22721

See merge request !6589

Update health_check gem to `~> 2.2.0`

2016-10-12T16:55:00+00:00

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22278

Bump gitlab_git to 10.6.8

2016-10-12T13:32:57+00:00

Signed-off-by: Dmitriy Zaporozhets

Use activerecord_sane_schema_dumper

2016-10-12T12:51:29+00:00

Signed-off-by: Rémy Coutable