Commits · c9769531d87e9c270cd615da08924448228c5579 · nexedi / gitlab-ce

22 May, 2018 1 commit
- When last Geo::EventLog is not available, geo:status rake task fails · c9769531
  Ash McKenzie authored May 21, 2018
  
  c9769531
19 May, 2018 7 commits
- Merge branch 'ce-to-ee-2018-05-19' into 'master' · 7701c4ba
  Stan Hu authored May 19, 2018
```
CE upstream - 2018-05-19 06:23 UTC

See merge request gitlab-org/gitlab-ee!5781
```
  7701c4ba
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-19 · 82904349
  GitLab Bot authored May 19, 2018
  
  82904349
- Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into 'master' · ad9e0091
  Grzegorz Bizon authored May 19, 2018
```
Fix error when deleting an empty list of refs

Closes #45743

See merge request gitlab-org/gitlab-ce!19053
```
  ad9e0091
- Merge branch 'ce-to-ee-2018-05-18' into 'master' · 9af1d758
  Stan Hu authored May 19, 2018
```
CE upstream - 2018-05-18 21:23 UTC

See merge request gitlab-org/gitlab-ee!5778
```
  9af1d758
- Fix error when deleting an empty list of refs · 100c687c
  Sergey Sinev authored Apr 25, 2018
```
Closes #45743
```
  100c687c
- Resolve conflicts in .flayignore · 2f9f7b96
  Stan Hu authored May 18, 2018
  
  2f9f7b96
- Merge branch '46498-do-not-modify-strings' into 'master' · 95dacabe
  Stan Hu authored May 19, 2018
```
Resolve "Blob#batch can't handle frozen string paths"

Closes #46498

See merge request gitlab-org/gitlab-ce!19039
```
  95dacabe
18 May, 2018 32 commits
- Merge branch 'geo-prevent-removing-registry-records' into 'master' · 5a9ee3b0
  Stan Hu authored May 18, 2018
```
[Geo] Don't remove project registry records

See merge request gitlab-org/gitlab-ee!5768
```
  5a9ee3b0
- Merge branch 'docs/fix-chmod' into 'master' · c3a4f443
  Stan Hu authored May 18, 2018
```
Chmod 644 on offending files

See merge request gitlab-org/gitlab-ce!19051
```
  c3a4f443
- Merge branch 'docs/fix-chmod-ee' into 'master' · 7e551159
  Stan Hu authored May 18, 2018
```
Chmod 644 on offending files

See merge request gitlab-org/gitlab-ee!5774
```
  7e551159
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-18 · 256ddc7a
  GitLab Bot authored May 18, 2018
```
# Conflicts:
#	.flayignore

[ci skip]
```
  256ddc7a
- Merge branch 'fix-double-brackets-in-wiki-markdown' into 'master' · 2e350216
  Robert Speicher authored May 18, 2018
```
Fix double brackets being linkified in wiki markdown

See merge request gitlab-org/gitlab-ce!18524
```
  2e350216
- Fix double brackets being linkified in wiki markdown · 1b530f96
  Alex authored May 18, 2018
  
  1b530f96
- Merge branch 'fix/handle-large-commit-tag-message' into 'master' · 076ab2e8
  Robert Speicher authored May 18, 2018
```
Add handling for commit/tags with big messages

See merge request gitlab-org/gitlab-ce!17892
```
  076ab2e8
- Merge branch 'ce-to-ee-2018-05-18' into 'master' · 8cb1e6bb
  Robert Speicher authored May 18, 2018
```
CE upstream - 2018-05-18 18:28 UTC

Closes #5925 and gitaly#1105

See merge request gitlab-org/gitlab-ee!5775
```
  8cb1e6bb
- Add handling for commit/tags with big messages · 019f5e24
  Ahmad Sherif authored Mar 20, 2018
  
  019f5e24
- Resolve lib/gitlab/auth/ldap/access.rb · a7489f4a
  Robert Speicher authored May 18, 2018
  
  a7489f4a
- Merge branch 'gitaly-1182-search-by-content-name' into 'master' · ee59fdf5
  Robert Speicher authored May 18, 2018
```
Migrate Repo#search_by_{content,name}  to Gitaly

See merge request gitlab-org/gitlab-ce!18750
```
  ee59fdf5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-18 · 7248ad97
  GitLab Bot authored May 18, 2018
```
# Conflicts:
#	lib/gitlab/auth/ldap/access.rb

[ci skip]
```
  7248ad97
- Merge branch 'update-cicd-icon' into 'master' · fa04ec11
  Mike Greiling authored May 18, 2018
```
Update CI/CD icon to be the rocket

Closes #46491

See merge request gitlab-org/gitlab-ce!19024
```
  fa04ec11
- Merge branch '6084-minimize-ce-ee-diff-mailers-notify' into 'master' · e234c4ea
  Robert Speicher authored May 18, 2018
```
Resolve "Minimize CE/EE diff in app/mailers/notify.rb"

Closes #6084

See merge request gitlab-org/gitlab-ee!5764
```
  e234c4ea
- Merge branch '5913-extract-ee-specific-lines-for-lib-gitlab-auth' into 'master' · c0949853
  Robert Speicher authored May 18, 2018
```
[CE] Resolve "Extract EE specific files/lines for lib/gitlab/auth"

See merge request gitlab-org/gitlab-ce!19037
```
  c0949853
- Merge branch '5913-extract-ee-specific-lines-for-lib-gitlab-auth' into 'master' · 6e993aa3
  Robert Speicher authored May 18, 2018
```
Resolve "Extract EE specific files/lines for lib/gitlab/auth"

Closes #5913

See merge request gitlab-org/gitlab-ee!5761
```
  6e993aa3
- Merge branch 'doc-update_sast_supported_languages' into 'master' · 501916fe
  Achilleas Pipinellis (🌴 May 18 - May 21 🌴) authored May 18, 2018
```
Add Java Gradle and PHP to the list of supported languages for SAST

See merge request gitlab-org/gitlab-ee!5751
```
  501916fe
- Chmod 644 on offending files · 431d1976
  Achilleas Pipinellis authored May 18, 2018
  
  431d1976
- Chmod 644 on offending files · 12292502
  Achilleas Pipinellis authored May 18, 2018
  
  12292502
- Merge branch 'docs/incremental-rollouts' into 'master' · 5bfcf12d
  Achilleas Pipinellis (🌴 May 18 - May 21 🌴) authored May 18, 2018
```
Add docs for incremental rollouts

Closes gitlab-ee#5925

See merge request gitlab-org/gitlab-ce!18978
```
  5bfcf12d
- Merge branch 'docs/incremental-rollouts-ee' into 'master' · d95be442
  Achilleas Pipinellis (🌴 May 18 - May 21 🌴) authored May 18, 2018
```
Add docs for incremental rollouts

See merge request gitlab-org/gitlab-ee!5749
```
  d95be442
- Merge branch 'ce-to-ee-2018-05-18' into 'master' · 9a785ebf
  Rémy Coutable authored May 18, 2018
```
CE upstream - 2018-05-18 12:27 UTC

Closes gitlab-org/distribution/team-tasks#87 et gitlab-qa#245

See merge request gitlab-org/gitlab-ee!5763
```
  9a785ebf
- Resolve conflict in spec/lib/gitlab/incoming_email_spec.rb · 63b345a9
  Rémy Coutable authored May 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  63b345a9
- Merge branch 'ee-constants' into 'master' · f253d1de
  Robert Speicher authored May 18, 2018
```
Use EE to contain EE constants

See merge request gitlab-org/gitlab-ee!5752
```
  f253d1de
- Merge branch 'zj-calculate-checksum-mandator' into 'master' · 8bacfbd1
  Nick Thomas authored May 18, 2018
```
Calculating repository checksums executed by Gitaly

Closes gitaly#1105 and #46293

See merge request gitlab-org/gitlab-ce!18907
```
  8bacfbd1
- Extract EE-specific lines to EE::Gitlab::Auth::UserAuthFinders · 3fcdf8bc
  Rémy Coutable authored May 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3fcdf8bc
- Extract EE-specific lines to EE::Gitlab::Auth::Saml::Config · 257ac6ea
  Rémy Coutable authored May 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  257ac6ea
- Extract EE-specific lines to EE::Gitlab::Auth::LDAP::Config · 0976623a
  Rémy Coutable authored May 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0976623a
- Remove EE-specific comment from EE::Gitlab::Auth::LDAP::Person · 554299ea
  Rémy Coutable authored May 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  554299ea
- Extract EE-specific lines to EE::Gitlab::Auth::Saml::User · d36350ba
  Rémy Coutable authored May 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d36350ba
- Merge branch 'memoize-database-version' into 'master' · 63831a24
  Rémy Coutable authored May 18, 2018
```
Memoize Gitlab::Database.version

See merge request gitlab-org/gitlab-ce!19021
```
  63831a24
- Minimize CE/EE difference in Gitlab::Auth::LDAP::User · d34d6a58
  Rémy Coutable authored May 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d34d6a58