Commits · 99ba247c7359b8a91fc11b90cb5099d224130265 · nexedi / gitlab-ce · GitLab

28 May, 2018 3 commits
- Merge branch 'revert-incoming-email-patch-for-gitlab-com' into 'master' · 99ba247c
  Douwe Maan authored May 28, 2018
```
Revert incoming email patch for GitLab.com

See merge request gitlab-org/gitlab-ee!5376
```
  99ba247c
- Merge branch 'rs-committer-verified-email' into 'master' · f7c22b83
  Douwe Maan authored May 28, 2018
```
Fix typo in `push_rule_committer_not_verified` interpolation

Closes #6186

See merge request gitlab-org/gitlab-ee!5843
```
  f7c22b83
- Merge branch '45190-create-notes-diff-files-ee' into 'master' · 2b3d1fe4
  Douwe Maan authored May 28, 2018
```
[CE port] Persist truncated note diffs on a new table

See merge request gitlab-org/gitlab-ee!5813
```
  2b3d1fe4
26 May, 2018 9 commits
- Merge branch 'ce-to-ee-2018-05-26' into 'master' · 99b65a12
  Stan Hu authored May 26, 2018
```
CE upstream - 2018-05-26 12:23 UTC

See merge request gitlab-org/gitlab-ee!5863
```
  99b65a12
- Merge branch '3912-transparently-proxy-http-git-push-from-secondary-to-primary' into 'master' · 60309ca5
  Nick Thomas authored May 26, 2018
```
Resolve "Transparently proxy HTTP Git push from secondary to primary"

Closes #3912

See merge request gitlab-org/gitlab-ee!5785
```
  60309ca5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-26 · 2feba562
  GitLab Bot authored May 26, 2018
  
  2feba562
- Merge branch 'ce-to-ee-bootstrap4' into 'master' · 8e72417d
  Dmitriy Zaporozhets authored May 26, 2018
```
Ce to ee bootstrap4

See merge request gitlab-org/gitlab-ee!5860
```
  8e72417d
- fix failing karma test in `spec/javascripts/boards/issue_spec.js` · 76c5abca
  Lukas Eipert authored May 26, 2018
  
  76c5abca
- Fix lint in `app/views/profiles/keys/_key_details.html.haml` · 182b3acb
  Lukas Eipert authored May 26, 2018
  
  182b3acb
- resolve conflict in `app/assets/javascripts/jobs/components/sidebar_details_block.vue` · 530f2cda
  Lukas Eipert authored May 26, 2018
  
  530f2cda
- Geo: Update docs on push to secondary current limitations · 258796c4
  Ash McKenzie authored May 26, 2018
  
  258796c4
- Geo: Redirect secondary HTTP git push to primary · 8f71ff07
  Ash McKenzie authored May 26, 2018
  
  8f71ff07
25 May, 2018 28 commits
- Fix conflict in yarn.lock · 0b75b130
  Clement Ho authored May 25, 2018
  
  0b75b130
- Fix conflict in app/views/shared/runners/_form.html.haml · d1e6e6c9
  Clement Ho authored May 25, 2018
  
  d1e6e6c9
- Fix conflict in app/views/shared/milestones/_sidebar.html.haml · e635a46f
  Clement Ho authored May 25, 2018
  
  e635a46f
- Fix conflict in app/views/shared/milestones/_issuables.html.haml · 837c502f
  Clement Ho authored May 25, 2018
  
  837c502f
- Fix conflict in app/views/shared/members/_requests.html.haml · 99c9fd31
  Clement Ho authored May 25, 2018
  
  99c9fd31
- Fix conflict in app/views/shared/members/_member.html.haml · 46daeba9
  Clement Ho authored May 25, 2018
  
  46daeba9
- Fix conflict in app/views/shared/issuable/form/_title.html.haml · 812da130
  Clement Ho authored May 25, 2018
  
  812da130
- Fix conflict in app/views/shared/issuable/form/_merge_params.html.haml · 74719490
  Clement Ho authored May 25, 2018
  
  74719490
- Fix conflict in app/views/shared/issuable/_sidebar.html.haml · bbdaf15e
  Clement Ho authored May 25, 2018
  
  bbdaf15e
- Fix conflict in app/views/shared/deploy_keys/_form.html.haml · 59d00287
  Clement Ho authored May 25, 2018
  
  59d00287
- Fix conflict in app/views/shared/boards/components/_board.html.haml · 94b55caa
  Clement Ho authored May 25, 2018
  
  94b55caa
- Fix conflict in app/views/shared/boards/_show.html.haml · c543b61c
  Clement Ho authored May 25, 2018
  
  c543b61c
- Fix conflict in app/views/shared/_service_settings.html.haml · fbd30b07
  Clement Ho authored May 25, 2018
  
  fbd30b07
- Fix conflict in app/views/shared/_new_commit_form.html.haml · 5958201e
  Clement Ho authored May 25, 2018
  
  5958201e
- Fix conflict in app/views/shared/_merge_requests.html.haml · 60f72071
  Clement Ho authored May 25, 2018
  
  60f72071
- Fix conflict in app/views/shared/_label_row.html.haml · 094a643d
  Clement Ho authored May 25, 2018
  
  094a643d
- Fix conflict in app/views/shared/_label.html.haml · b51814a6
  Clement Ho authored May 25, 2018
  
  b51814a6
- Fix conflict in app/views/shared/_issues.html.haml · 3c14be67
  Clement Ho authored May 25, 2018
  
  3c14be67
- Fix conflict in app/views/shared/_commit_message_container.html.haml · fda87654
  Clement Ho authored May 25, 2018
  
  fda87654
- Fix conflict in app/views/shared/_clone_panel.html.haml · 05ee8d87
  Clement Ho authored May 25, 2018
  
  05ee8d87
- Merge branch 'leipert-move-ee-specific-pipeline-scss-backport' into 'master' · cb868f41
  Annabel Gray authored May 25, 2018
```
Backport changes of gitlab-ee!5852

See merge request gitlab-org/gitlab-ce!19145
```
  cb868f41
- Fix conflict in app/views/projects/wikis/git_access.html.haml · 92345f47
  Clement Ho authored May 25, 2018
  
  92345f47
- Fix conflict in app/views/projects/wikis/_sidebar.html.haml · b616cf0d
  Clement Ho authored May 25, 2018
  
  b616cf0d
- Fix conflict in app/views/projects/wikis/_form.html.haml · fcc5edf1
  Clement Ho authored May 25, 2018
  
  fcc5edf1
- Merge branch 'leipert-move-ee-specific-pipeline-scss' into 'master' · 6a083e88
  Annabel Gray authored May 25, 2018
```
Move EE specific code from app/assets/stylesheets/pages/pipelines.scss

See merge request gitlab-org/gitlab-ee!5852
```
  6a083e88
- Move EE specific code from app/assets/stylesheets/pages/pipelines.scss · 6fd5094b
  Lukas Eipert authored May 25, 2018
  
  6fd5094b
- Fix conflict in app/views/projects/settings/ci_cd/_form.html.haml · 4239b9bd
  Clement Ho authored May 25, 2018
  
  4239b9bd
- Fix conflict in app/views/projects/services/prometheus/_show.html.haml · cce69cf9
  Clement Ho authored May 25, 2018
  
  cce69cf9