delta/gitlab/gitlab-ce.git/Gemfile.lock, branch zj-force-push-opt-out

Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter

2018-06-12T12:31:10+00:00

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

2018-06-11T09:59:25+00:00

Update rspec to 3.7

See merge request gitlab-org/gitlab-ce!19449

Merge branch 'upgrade-gitlab-markup' into 'master'

2018-06-11T08:01:51+00:00

Upgrade gitlab-markup to fix render issue with reStructuredText

See merge request gitlab-org/gitlab-ce!19596

Bump grape-path-helpers to 1.0.5

2018-06-08T23:44:05+00:00

Upgrade gitlab-markup to fix render issue with reStructuredText

2018-06-08T17:46:44+00:00

Merge branch 'rails5-fix-47370' into 'master'

2018-06-08T15:08:45+00:00

Use same gem versions for rails5 as for rails4 where possible

Closes #47370, #46232, #47367, and #47373

See merge request gitlab-org/gitlab-ce!19498

Merge branch 'use-restore-custom-hooks-gitaly' into 'master'

2018-06-08T11:49:13+00:00

Use RestoreCustomHooks RPC in restore rake task

See merge request gitlab-org/gitlab-ce!19370

Merge branch 'feature/customizable-favicon' into 'master'

2018-06-07T16:54:41+00:00

Customizable favicon

Closes #15661

See merge request gitlab-org/gitlab-ce!14497

Update rspec to 3.7

2018-06-07T14:54:41+00:00

Use RestoreCustomHooks RPC in restore rake task

2018-06-07T12:26:20+00:00