delta/gitlab/gitlab-ce.git/config, branch patch/load_average gitlab.com: gitlab-org/gitlab-ce.git remove extra space to fix codestyle 2016-05-13T07:51:13+00:00 Gabriel Mazetto gabriel@gitlab.com 2016-05-13T07:51:13+00:00 8d58e691c69f623878522c4f0dccf9f24229e9ce 






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







Merge branch 'send-incremental-build-log' into 'master'

2016-05-12T16:48:42+00:00

Jacob Schatz
jschatz@gitlab.com

2016-05-12T16:48:42+00:00

f2303f9df061d6ff85d0ff0fee9e3aa54df97ea7


Update build log incrementally

Proof of concept implementation of incremental sending of build log to browser.

cc @jschatz1 @vsizov @grzesiek @tmaczukin 


See merge request !3737





Update build log incrementally

Proof of concept implementation of incremental sending of build log to browser.

cc @jschatz1 @vsizov @grzesiek @tmaczukin 


See merge request !3737






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












Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master'

2016-05-11T22:04:25+00:00

Douwe Maan
douwe@gitlab.com

2016-05-11T22:04:25+00:00

f2251273b9868c94ac2a6f3f2e231282a4687043


Add snippet tab under user profile

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

See merge request !4001





Add snippet tab under user profile

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

See merge request !4001






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>







Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile
2016-05-11T02:14:56+00:00

Long Nguyen
long.polyglot@gmail.com

2016-05-11T02:14:56+00:00

a22d559d27eda2661039ed856dc636171f4b7362












Merge remote-tracking branch 'origin/master' into send-incremental-build-log
2016-05-10T18:58:10+00:00

Kamil Trzcinski
ayufan@ayufan.eu

2016-05-10T18:58:10+00:00

db25c17036b47cc4ee0bd08b7dc70def25d9a3c9