delta/gitlab/gitlab-ce.git/lib, branch normalize_frontend_headers gitlab.com: gitlab-org/gitlab-ce.git Merge branch '22974-trigger-service-events-through-api' into 'master' 2017-01-23T16:44:12+00:00 Douwe Maan douwe@gitlab.com 2017-01-23T16:44:12+00:00 30d5e9fa54e0beacfb9b28c307543ff359f17668 adds events to services api deserialization Closes #22974 See merge request !8324 

adds events to services api deserialization

Closes #22974

See merge request !8324
 Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' 2017-01-23T14:32:06+00:00 Kamil Trzciński ayufan@ayufan.eu 2017-01-23T14:32:06+00:00 7446c2f5cf7aaf9ebc323232064bf4bc6360b644 Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503 

Use a warning icon for a stage with allowed to fail builds

Closes #21948

See merge request !8503
 adds test suite 2017-01-22T00:02:29+00:00 Tiago Botelho tiagonbotelho@hotmail.com 2017-01-12T22:33:04+00:00 4b6e583ce0a395ec4a0dbc1a3a81680b1a0aa700 






adds events to services api deserialization
2017-01-22T00:02:29+00:00

Tiago Botelho
tiagonbotelho@hotmail.com

2016-12-27T12:44:24+00:00

cd51af1a991eaa5e16e3c6b94c89d90e20a5641f












Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"
2017-01-21T22:55:35+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2017-01-21T22:55:35+00:00

baeaa97ef49558a303b0bd7b6cc9ce4ccfc13d1d

This reverts merge request !8573




This reverts merge request !8573






Revert "Merge branch 'backport-fix-load-error' into 'master'"
2017-01-21T00:37:04+00:00

Stan Hu
stanhu@gmail.com

2017-01-21T00:37:04+00:00

8dbac708dcb34d3a0510e9ba65e64b9377c93d49

This reverts merge request !8671




This reverts merge request !8671






Don't define ApplicationSetting defaults in a constant
2017-01-20T19:10:15+00:00

Rémy Coutable
remy@rymai.me

2017-01-20T19:07:29+00:00

aaa986c0d20d8df6ca46ff28d52c6c807035608d

Signed-off-by: Rémy Coutable <remy@rymai.me>





Signed-off-by: Rémy Coutable <remy@rymai.me>







Merge branch 'fix/import-users' into 'master'

2017-01-20T16:03:44+00:00

Rémy Coutable
remy@rymai.me

2017-01-20T16:03:44+00:00

4af1f18639935b3a4347902f42a44e851332d5e3


Fix import no longer mapping users as admin

Closes #25346

See merge request !8625





Fix import no longer mapping users as admin

Closes #25346

See merge request !8625






Merge branch 'dont-persist-application-settings-in-test-env' into 'master'

2017-01-20T15:42:54+00:00

Robert Speicher
robert@gitlab.com

2017-01-20T15:42:54+00:00

9cac0317696cf47beb77bab28a914411b09ff26c


Don't persist application settings in test env

See merge request !8573





Don't persist application settings in test env

See merge request !8573






fix member mapper spec
2017-01-20T13:37:52+00:00

James Lopez
james@jameslopez.es

2017-01-20T13:37:52+00:00

e8396d8e734756be0a1460e83ed010025082e933