- 03 Sep, 2018 3 commits
-
-
Sean McGivern authored
-
Sean McGivern authored
-
Sean McGivern authored
-
- 23 Aug, 2018 2 commits
-
-
Stan Hu authored
CE upstream - 2018-08-23 00:21 UTC See merge request gitlab-org/gitlab-ee!6974
-
GitLab Bot authored
-
- 22 Aug, 2018 35 commits
-
-
GitLab Release Tools Bot authored
[ci skip]
-
GitLab Release Tools Bot authored
[ci skip]
-
GitLab Release Tools Bot authored
[ci skip]
-
Stan Hu authored
CE upstream - 2018-08-22 21:21 UTC Closes gitlab-ce#49971 See merge request gitlab-org/gitlab-ee!6973
-
GitLab Bot authored
-
Stan Hu authored
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
-
Alejandro Rodríguez authored
Fix broken Git over HTTP clones with LDAP users Closes #50579 See merge request gitlab-org/gitlab-ce!21352
-
Alejandro Rodríguez authored
Fix wrong commit count in push event payload Closes #49971 See merge request gitlab-org/gitlab-ce!21338
-
Stan Hu authored
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
-
Stan Hu authored
CE upstream - 2018-08-22 18:21 UTC See merge request gitlab-org/gitlab-ee!6971
-
GitLab Bot authored
-
Stan Hu authored
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
-
Stan Hu authored
Improve system hook spec in spec/services/git_push_service_spec.rb See merge request gitlab-org/gitlab-ce!21347
-
Dmitriy Zaporozhets authored
CE upstream - 2018-08-22 12:21 UTC Closes gitlab-ce#50549 and gitlab-qa#317 See merge request gitlab-org/gitlab-ee!6968
-
Dmitriy Zaporozhets authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Dmitriy Zaporozhets authored
EE- remove scss variables 4 See merge request gitlab-org/gitlab-ee!6961
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Annabel Dunstone Gray authored
-
Filipa Lacerda authored
-
Filipa Lacerda authored
Update gitlab-svgs to 1.2.8 See merge request gitlab-org/gitlab-ce!21346
-
Stan Hu authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
GitLab Bot authored
# Conflicts: # CHANGELOG.md # app/assets/javascripts/api.js # app/assets/stylesheets/framework/variables.scss [ci skip]
-
Sean McGivern authored
Eliminate unnecessary and duplicate system hook fires Closes #50549 See merge request gitlab-org/gitlab-ce!21337
-
Filipa Lacerda authored
Added store for file templates in the Web IDE See merge request gitlab-org/gitlab-ce!21272
-
Filipa Lacerda authored
EE port of ide-file-templates-store See merge request gitlab-org/gitlab-ee!6931
-
Rémy Coutable authored
CE upstream - 2018-08-21 21:21 UTC Closes gitlab-ce#40550 See merge request gitlab-org/gitlab-ee!6962
-
Sid Sijbrandij authored
-
Phil Hughes authored
-
Rémy Coutable authored
[QA] Fix a 'superclass must be a Class' error Closes gitlab-qa#317 See merge request gitlab-org/gitlab-ce!21340
-
Rémy Coutable authored
Avoid nil safe message See merge request gitlab-org/gitlab-ce!21326
-
Rémy Coutable authored
Bump fog-google to 1.7.1 and google-api-client to 0.23.0 See merge request gitlab-org/gitlab-ce!21295
-