delta/gitlab/gitlab-ce.git/config/initializers, branch patch/load_average gitlab.com: gitlab-org/gitlab-ce.git Codestyle: make sure we have space around operators 2016-05-13T07:46:56+00:00 Gabriel Mazetto gabriel@gitlab.com 2016-05-11T02:58:06+00:00 f5a0ac0fc197bae2eb5fe1045ed237cdbbaf6ea4 






Merge branch 'deprecated-class-methods-cop' into 'master'

2016-05-12T22:41:01+00:00

Robert Speicher
robert@gitlab.com

2016-05-12T22:41:01+00:00

4735a753407b364f7034cf4dbd6ae621b25396c2


Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of `.exist?`.
Also fixes all existing uses of the deprecated methods.

See merge request !4087





Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of `.exist?`.
Also fixes all existing uses of the deprecated methods.

See merge request !4087






Merge branch 'health-check-route'
2016-05-12T21:39:03+00:00

Douwe Maan
douwe@selenight.nl

2016-05-12T21:39:03+00:00

7fc51d1908a1ce7b0a09f273881c08102efd1dae

# Conflicts:
#	db/schema.rb





# Conflicts:
#	db/schema.rb







Support token header for health check token, and general cleanup of the health_check feature.
2016-05-12T00:27:08+00:00

DJ Mountney
david@twkie.net

2016-05-12T00:27:08+00:00

c8f23bd2edc19f968446b149120df1f7798eb4b1












Remove Rails monkey-patches now that we're using Rails 4.2.6
2016-05-11T10:32:48+00:00

Rémy Coutable
remy@rymai.me

2016-05-11T10:32:48+00:00

941301339dd8d1e282c3e225808875ef86b45f2b

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





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







Set the standard health_check options to include the cache check.
2016-05-10T15:24:09+00:00

DJ Mountney
david@twkie.net

2016-05-05T19:25:02+00:00

9898f9b4e6b80edaa914675edfa9b229498b31fe












Add the health_check gem end expose the health_check route
2016-05-10T15:24:09+00:00

DJ Mountney
david@twkie.net

2016-04-22T16:50:08+00:00

67dc3b9c1131b5a7f3f861a0fe35169fda5cd398












Fix a few places where autoloading would fail
2016-05-10T09:51:19+00:00

Rémy Coutable
remy@rymai.me

2016-04-15T15:35:40+00:00

5589dcf8db0daf2235158724f6b18115a9abfa42

- Fix naming of API::CommitStatuses
- Ensure we use require_dependency instead of require
- Ensure the namespace is right in lib/api/api.rb, otherwise, we
  might require Grape::API::Helpers which defines the `#params` method.
  This is to avoid requiring a file multiple times and getting an "Already
  initialized constant" error.

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





- Fix naming of API::CommitStatuses
- Ensure we use require_dependency instead of require
- Ensure the namespace is right in lib/api/api.rb, otherwise, we
  might require Grape::API::Helpers which defines the `#params` method.
  This is to avoid requiring a file multiple times and getting an "Already
  initialized constant" error.

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







Merge branch 'trusted-proxies-ip-addr' into 'master'

2016-05-09T09:47:16+00:00

Rémy Coutable
remy@rymai.me

2016-05-09T09:47:16+00:00

7d95d3cde79683fda221e3108d80e7d1fe86e81a


Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524

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

See merge request !3970





Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524

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

See merge request !3970






Enable the Rubocop DeprecatedClassMethods cop
2016-05-08T21:33:34+00:00

Connor Shea
connor.james.shea@gmail.com

2016-05-08T21:33:34+00:00

9cc0937b3a41caca89fa6722149248a8f7b0a447

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of
`.exist?`. Also fixes all existing uses of the deprecated methods.





This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of
`.exist?`. Also fixes all existing uses of the deprecated methods.