[ci skip]

[ci skip]

[ci skip]

[ci skip]

Geo: Use database-cached status if redis-cached status is unavailable

See merge request gitlab-org/gitlab-ee!6854

Ee remove scss variables 5

See merge request gitlab-org/gitlab-ee!6970

[Rails5] Use hexadecimal checksum

Closes #6744

See merge request gitlab-org/gitlab-ee!6768

Use package icon for packages feature in project sidebar

Closes #7303

See merge request gitlab-org/gitlab-ee!6966

CE upstream - 2018-08-23 00:21 UTC

See merge request gitlab-org/gitlab-ee!6974

[ci skip]

[ci skip]

[ci skip]

CE upstream - 2018-08-22 21:21 UTC

Closes gitlab-ce#49971

See merge request gitlab-org/gitlab-ee!6973

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Merge branch '7309-geo-secondary-with-ldap-configured-can-t-update-last_credential_check_at-due-to-read-only-db' into 'master'

Resolve "Geo:  Secondary with LDAP configured can't update last_credential_check_at due to read-only DB"

Closes #7309

See merge request gitlab-org/gitlab-ee!6965

Fix broken Git over HTTP clones with LDAP users

Closes #50579

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

Fix wrong commit count in push event payload

Closes #49971

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

Due to a regression in !20608, the LDAP authenticator was not being used
unless OmniAuth was enabled. This change allows the LDAP provider to be used
if it is configured regardless of the OmniAuth setting.

Closes #50579

CE upstream - 2018-08-22 18:21 UTC

See merge request gitlab-org/gitlab-ee!6971

This fixes a regression in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20916.
We now only use the full commit count for the initial push to the default branch.
Otherwise, we rely on the number of commits that we calculated occurred in the push.

The original behavior in 11.1.4:

1. When a new branch is pushed, `@push_commits_count` was set to the total
number of refs available for the branch.
2. For other branches, `@push_commits_count` would remain `nil`.
3. `GitPushService#build_push_data` would build the push data with
`@push_commits_count`.
4. If this were `nil`, it would be set to the right value here:
https://gitlab.com/gitlab-org/gitlab-ce/blob/v11.1.4/lib/gitlab/data_builder/push.rb#L60

Broken behavior:

1. `GitPushService#push_commits_count` is always called.
2. The total number of commits is therefore always equal to the total number of refs available.

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

Improve system hook spec in spec/services/git_push_service_spec.rb

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

CE upstream - 2018-08-22 12:21 UTC

Closes gitlab-ce#50549 and gitlab-qa#317

See merge request gitlab-org/gitlab-ee!6968

EE- remove scss variables 4

See merge request gitlab-org/gitlab-ee!6961

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Update gitlab-svgs to 1.2.8

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/api.js
#	app/assets/stylesheets/framework/variables.scss

[ci skip]