delta/gitlab/gitlab-ce.git/Gemfile.lock, branch user-events-api gitlab.com: gitlab-org/gitlab-ce.git Make search results use the markdown cache columns, treating them consistently 2016-10-07T01:54:26+00:00 Nick Thomas nick@gitlab.com 2016-10-06T21:55:27+00:00 dd159a750b294ee89cb8a4143284ff9788b639fc Truncato is introduced as a dependency to intelligently shorten the rendered HTML to 200 characters; the previous approach could have resulted in invalid HTML being rendered. 
Truncato is introduced as a dependency to intelligently shorten the rendered
HTML to 200 characters; the previous approach could have resulted in invalid
HTML being rendered.
Merge commit 'dev/security' into 'master' 2016-10-06T06:33:11+00:00 Rémy Coutable remy@rymai.me 2016-10-06T06:33:11+00:00 d51bb99a7e7c4dce4abefbf4967aa69054066c3b Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Don't send Private-Token headers to Sentry 2016-10-04T14:57:01+00:00 Jacob Vosmaer jacob@gitlab.com 2016-10-04T14:35:41+00:00 437bebb0ff6e7deba6fd157ec6b55112e125731f Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537 
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537
Update RuboCop to 0.43.0 and update configuration 2016-10-04T11:28:01+00:00 Robert Speicher rspeicher@gmail.com 2016-10-04T11:28:01+00:00 961c53c2ca46e6cfdb2bcaddc0570b1e210302d2 `Style/VariableNumber` is explicitly disabled because I don't think we care if we name a variable `var_1` or `var1`. 
`Style/VariableNumber` is explicitly disabled because I don't think we
care if we name a variable `var_1` or `var1`.
Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0. 2016-10-03T21:54:52+00:00 Connor Shea connor.james.shea@gmail.com 2016-10-03T21:54:52+00:00 f571aeb5ce38dce1a9e5f58d76360836d4a8f8a0 Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08 
Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08
Replace talk_list patch with a patched fork 2016-09-30T21:38:02+00:00 Jared Deckard jared.deckard@gmail.com 2016-09-30T21:38:02+00:00 88c1db4a2b365a75a43c46a0bed58ca1f8069408 






fix broken repo 500 errors in UI and added relevant specs
2016-09-29T14:58:14+00:00

James Lopez
james@jameslopez.es

2016-09-23T07:42:07+00:00

29141ed3ea6157a60d9748921782015626a17f9e












Merge branch 'cs-upgrade-devise' into 'master'

2016-09-29T12:28:18+00:00

Robert Speicher
robert@gitlab.com

2016-09-29T12:28:18+00:00

570ae33656f24299ca4bb589d0e7043bd120c7a3


Upgrade Devise from 4.1.1 to 4.2.0.

This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. It also deprecates `Devise::TestHelpers` in favor of `Devise::Test::ControllerHelpers`.

Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01

Working toward #14286, as always.

See merge request !6461





Upgrade Devise from 4.1.1 to 4.2.0.

This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. It also deprecates `Devise::TestHelpers` in favor of `Devise::Test::ControllerHelpers`.

Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01

Working toward #14286, as always.

See merge request !6461






Remove Flog as we use a Rubocop that does its job.
2016-09-29T01:38:43+00:00

Connor Shea
connor.james.shea@gmail.com

2016-09-29T01:38:43+00:00

e3f12e975d59b0606b8f1365e21814b34ea83767












Bump ruby prof to 0.16
2016-09-28T05:40:26+00:00

Elan Ruusamäe
glen@delfi.ee

2016-08-25T14:42:58+00:00

ef063e00a9262a20f4bd584f1ee246b6f79c0025

This solve issues with ruby builds with rubygems preload
see https://github.com/ruby-prof/ruby-prof/pull/191

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





This solve issues with ruby builds with rubygems preload
see https://github.com/ruby-prof/ruby-prof/pull/191

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