Commits · master · Valerii Kravets / GitLab Enterprise Edition · GitLab

May 29, 2018
- Merge branch '6045-extract-ee-specific-specs-lines' into 'master' · 90dbfbb3
  Robert Speicher authored May 29, 2018
  90dbfbb3
- Merge remote-tracking branch 'dev/master' · 4e55bd46
  Mayra Cabrera authored May 29, 2018
  
  4e55bd46
- Merge branch 'security-include-directive-allows-ssrf-requests' into 'master' · e9205f98
  Mayra Cabrera authored May 29, 2018
  e9205f98
- Merge branch 'security-access-dropdown-user-escape' into 'master' · 57fab4c6
  Mayra Cabrera authored May 29, 2018
  57fab4c6
- Merge branch 'security-approvers-security-fix-master' into 'master' · 88280301
  Mayra Cabrera authored May 29, 2018
  88280301
- Merge branch 'ee-bootstrap-help-block' into 'master' · 8a263f52
  Annabel Dunstone Gray authored May 29, 2018
  8a263f52
- Merge branch 'ee-38325-variables-usage-in-gitlab-ci-yml-docs' into 'master' · 8694bbd4
  Achilleas Pipinellis authored May 29, 2018
  8694bbd4
- EE port of 38325-variables-usage-in-gitlab-ci-yml-docs · 14d88690
  Tomasz Maczukin authored May 29, 2018 and Achilleas Pipinellis committed May 29, 2018
  
  14d88690
- Merge branch 'sh-improve-fdw-comparison' into 'master' · 5b52f8c6
  Nick Thomas authored May 29, 2018
  5b52f8c6
- Merge branch... · 8069cb32
  Robert Speicher authored May 29, 2018
  8069cb32
- Replace help-block with form-text.text-muted (EE) · d82cbe7a
  Clement Ho authored May 29, 2018
  
  d82cbe7a
- Merge branch 'ee-46758-fallout-of-cacheable-attribute' into 'master' · 6eba0dd7
  Douwe Maan authored May 29, 2018
  6eba0dd7
- Merge branch 'docs/redirect-k8s-service-page-ee' into 'master' · 71d59fc7
  Achilleas Pipinellis authored May 29, 2018
  71d59fc7
- Merge branch 'ce-to-ee-2018-05-29' into 'master' · 8f7f5520
  Rémy Coutable authored May 29, 2018
  8f7f5520
- Resolve conflict in doc/user/project/integrations/kubernetes.md · 33007a36
  Rémy Coutable authored May 29, 2018
  33007a36
- Resolve conflict in doc/ci/autodeploy/index.md · 5ec425fb
  Rémy Coutable authored May 29, 2018
  5ec425fb
- fix conflicts in locale/gitlab.pot · 7d25e3a7
  Lukas Eipert authored May 29, 2018
  
  7d25e3a7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-29 · 2070a2e9
  🤖 GitLab Bot 🤖 authored May 29, 2018
  2070a2e9
- Merge branch 'ce-to-ee-2018-05-28' into 'master' · 21419046
  Rémy Coutable authored May 29, 2018
  21419046
- Allow comment after if/unless clause · 0ae45b9e
  Rémy Coutable authored May 28, 2018
  0ae45b9e
- [EE] Ensure ApplicationSetting#performance_bar_allowed_group_id is properly... · 63b20829
  Rémy Coutable authored May 25, 2018
  63b20829
- Merge branch 'dz-redesign-group-settings-page' into 'master' · c5adf04c
  Filipa Lacerda authored May 29, 2018
  c5adf04c
- Merge branch 'ee-dz-redesign-group-settings-page' into 'master' · 03b30da5
  Filipa Lacerda authored May 29, 2018
  03b30da5
- Merge branch 'patch-21' into 'master' · 1c6462c3
  Rémy Coutable authored May 29, 2018
  1c6462c3
- cleanup Prometheus setup details · ce793617
  Ben Bodenmiller authored May 29, 2018 and Rémy Coutable committed May 29, 2018
  
  ce793617
- Merge branch 'add-artifacts_expire_at-to-api' into 'master' · 6b7a70d2
  Grzegorz Bizon authored May 29, 2018
  6b7a70d2
- Resolve conflict in doc/administration/high_availability/gitlab.md · 7f32c287
  Rémy Coutable authored May 29, 2018
  7f32c287
- Resolve conflict in doc/administration/high_availability/database.md · 64dc6aa9
  Rémy Coutable authored May 29, 2018
  64dc6aa9
- Merge branch 'sh-tag-queue-duration-api-calls' into 'master' · 43ec52ab
  Sean McGivern authored May 29, 2018
  43ec52ab
- Merge branch 'qa/rs-api-users-spec' into 'master' · a75d1121
  Grzegorz Bizon authored May 29, 2018
  a75d1121
- Merge branch 'groups-controller-show-performance' into 'master' · 35597a4c
  Douwe Maan authored May 29, 2018
  35597a4c
- Merge branch '38919/wiki-empty-states' into 'master' · aaa98c73
  Phil Hughes authored May 29, 2018
  aaa98c73
- Add helpful messages to empty wiki view · 67199aed
  Paul Slaughter authored May 29, 2018 and Phil Hughes committed May 29, 2018
  
  67199aed
May 28, 2018
- Log queue duration for Grape API calls · 16e04e00
  Stan Hu authored May 25, 2018
  16e04e00
- Use full path to group settings partials · a7120df1
  Dmytro Zaporozhets (DZ) authored May 28, 2018
  a7120df1
- Use full path to group settings partials · 277ba7f8
  Dmytro Zaporozhets (DZ) authored May 28, 2018
  277ba7f8
- Merge branch 'docs/fix-contributing-broken-tag' into 'master' · 6e354cb6
  Rémy Coutable authored May 28, 2018
  6e354cb6
- Merge branch 'ab-45389-remove-double-checked-internal-id-generation' into 'master' · b7467908
  Yorick Peterse authored May 28, 2018
  b7467908
- Merge branch 'ce-6225-unify-app-views-milestones' into 'master' · 47cd6a06
  Rémy Coutable authored May 28, 2018
  47cd6a06
- Merge branch '6225-unify-app-views-milestones-ee' into 'master' · 35526612
  Rémy Coutable authored May 28, 2018
  35526612