delta/gitlab/gitlab-ce.git/lib, branch fix-migration-changes gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'grapify-to-h' into 'master' 2016-11-14T13:15:58+00:00 Rémy Coutable remy@rymai.me 2016-11-14T13:15:58+00:00 36fa5d660df96c49484cd27695da1df6e361eb8f Use to_h to convert params to a hash See merge request !7406 

Use to_h to convert params to a hash

See merge request !7406
 Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master' 2016-11-14T11:59:11+00:00 Kamil Trzciński ayufan@ayufan.eu 2016-11-14T11:59:11+00:00 39ec62ea9890fb35beb684348a50c28f4b241509 Improve naming convention in ci configuration module ## What does this MR do? This MR improves the naming convention in CI configuration module to reflect the domain design better. ## What are the relevant issue numbers? Related to #15060 See merge request !7448 

Improve naming convention in ci configuration module

## What does this MR do?

This MR improves the naming convention in CI configuration module to reflect the domain design better.

## What are the relevant issue numbers?

Related to #15060

See merge request !7448
 Merge branch 'grapify-subscription-api' into 'master' 2016-11-14T11:43:34+00:00 Rémy Coutable remy@rymai.me 2016-11-14T11:43:34+00:00 763a89a301e36e102ecefe6cfa452fc57cd661c2 Grapify subscription API ## What are the relevant issue numbers? Related to #22928 See merge request !7380 

Grapify subscription API

## What are the relevant issue numbers?

Related to #22928

See merge request !7380
 Fix indentation in CI variables entry class 2016-11-14T10:46:41+00:00 Grzegorz Bizon grzesiek.bizon@gmail.com 2016-11-14T10:46:41+00:00 b3f38797fd429701adf48b80bf917998e2c083a9 






Merge branch 'sh-fix-sidekiq-throttling-init' into 'master'

2016-11-14T10:29:45+00:00

Robert Speicher
robert@gitlab.com

2016-11-14T10:29:45+00:00

4e9b02c3e8174118c933e55aec3ddfd763c5984d


Only turn on Sidekiq throttling if column exists

If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column.

Closes #24452

See merge request !7446





Only turn on Sidekiq throttling if column exists

If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column.

Closes #24452

See merge request !7446






Merge branch 'user_filter_auth' into 'master'

2016-11-14T10:23:21+00:00

Rémy Coutable
remy@rymai.me

2016-11-14T10:23:21+00:00

2a90b69a8d968dc22ef630a948ae6f77fd927f23


Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. 

Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296

See merge request !6606





Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. 

Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296

See merge request !6606






Use #to_h to convert params to a hash
2016-11-14T10:17:51+00:00

Robert Schilling
rschilling@student.tugraz.at

2016-11-10T15:32:59+00:00

510092c83ad6b35dc4cc0ac1f15c643952f519b5












Grapify subscription API
2016-11-14T10:05:06+00:00

Robert Schilling
rschilling@student.tugraz.at

2016-11-09T15:57:14+00:00

f0b42c1079341ed0245f5e3971dd4da0f8760c38












Merge branch 'repository-name-emojis' into 'master'

2016-11-14T09:59:06+00:00

Rémy Coutable
remy@rymai.me

2016-11-14T09:59:06+00:00

006c163b53d062d990ac213deac70978b0a927cc


Added ability to put emojis into repository name

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

Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt

See merge request !7420





Added ability to put emojis into repository name

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

Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt

See merge request !7420






Change name of method for setting CI config entries
2016-11-14T09:51:56+00:00

Grzegorz Bizon
grzesiek.bizon@gmail.com

2016-11-14T09:51:56+00:00

a761d293662e48efca9c0607f0624ba8eec1b634