delta/gitlab/gitlab-ce.git/Gemfile, branch winh-upgrade-nokogiri

Upgrade Nokogiri because of CVE-2017-9050

2017-09-21T20:32:51+00:00

Upgrade gitlab-markup gem

2017-09-20T15:48:04+00:00

Add test-prof

2017-09-19T14:26:20+00:00

Signed-off-by: Rémy Coutable

Bump grape_logging gem to 1.7.0 to get status codes for error messages

2017-09-10T20:10:30+00:00

This recent update fixes an issue in grape_logging where the status
code would be "fail" for any non-20x responses. For more details, see:
https://github.com/aserafin/grape_logging/issues/29

Merge branch 'sh-add-grape-logging' into 'master'

2017-09-07T17:39:14+00:00

Add JSON logger in `log/api_json.log` for Grape API endpoints

Closes #36189

See merge request !14102

Merge branch '37411-update-omniauth-google-oauth2' into 'master'

2017-09-07T12:38:23+00:00

Update the omniauth-google-oauth2 gem to 0.5.2

Closes #37411

See merge request !14105

Update the omniauth-google-oauth2 gem to 0.5.2

2017-09-07T09:52:26+00:00

Signed-off-by: Rémy Coutable

Merge branch 'gitaly-tree-entries-fix' into 'master'

2017-09-07T09:46:13+00:00

Implement fix for n+1 issue on `flatten_tree` helper

Closes gitaly#530

See merge request !14097

Merge branch 'rs-update-capybara' into 'master'

2017-09-07T09:31:41+00:00

Update capybara 2.6.2 -> 2.15.1

See merge request !13976

Add JSON logger in `log/api_json.log` for Grape API endpoints

2017-09-07T06:09:27+00:00

Closes #36189