Commits · 26cc4719da83c0f327426d0a5b7a147b3f1f8ff0 · nexedi / gitlab-ce

07 Sep, 2018 2 commits
- refactor code based on feedback · 26cc4719
  James Lopez authored Sep 07, 2018
  
  26cc4719
- refactor code based on feedback · 295a6129
  James Lopez authored Sep 07, 2018
  
  295a6129
06 Sep, 2018 38 commits
- fix custom template export import strategy spec · 15717060
  James Lopez authored Sep 06, 2018
  
  15717060
- update EE files to remove old storage logic · e12b81ad
  James Lopez authored Sep 06, 2018
  
  e12b81ad
- Refactor code to remove object storage flag from Import/Export · 29953ced
  James Lopez authored Aug 29, 2018
```
Updated docs, refactor import/export code
Fix AvatarUploader path issue
Fix project export upload webhook error
```
  29953ced
- Merge branch 'ce-to-ee-2018-09-06' into 'master' · 2037dfd0
  Bob Van Landuyt authored Sep 06, 2018
```
CE upstream - 2018-09-06 12:23 UTC

See merge request gitlab-org/gitlab-ee!7267
```
  2037dfd0
- Resolve conflicts in kubernetes.rb · 427d087b
  Bob Van Landuyt authored Sep 06, 2018
  
  427d087b
- Fix conflicts in blob/_blob.html.haml · 91baf032
  Bob Van Landuyt authored Sep 06, 2018
  
  91baf032
- Merge branch 'docs-protected-environments' into 'master' · e990ad23
  Achilleas Pipinellis authored Sep 06, 2018
```
Add documentation for Protected Environments

Closes #7485

See merge request gitlab-org/gitlab-ee!6725
```
  e990ad23
- Copyedit protected environments docs · db367ede
  Achilleas Pipinellis authored Sep 06, 2018
  
  db367ede
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-06 · c4045b32
  GitLab Bot authored Sep 06, 2018
```
# Conflicts:
#	app/models/clusters/platforms/kubernetes.rb
#	app/views/projects/blob/_blob.html.haml

[ci skip]
```
  c4045b32
- Merge branch '51117-send-terminal-path-in-job-api' into 'master' · 4a14ff5b
  Kamil Trzciński authored Sep 06, 2018
```
Add terminal path to job API response

Closes #51117

See merge request gitlab-org/gitlab-ce!21537
```
  4a14ff5b
- Merge branch '51092-fix-mr-diff-file-filter-clear-button' into 'master' · 0bbea6da
  Phil Hughes authored Sep 06, 2018
```
Make MR diff file filter input Clear button functional

Closes #51092

See merge request gitlab-org/gitlab-ce!21556
```
  0bbea6da
- Make MR diff file filter input Clear button functional · 97b5ea02
  Kushal Pandya authored Sep 06, 2018
  
  97b5ea02
- Merge branch 'dz-maven-packages-api-ci-job-token' into 'master' · fcaf056f
  Kamil Trzciński authored Sep 06, 2018
```
Add CI Job token support to Maven packages API

See merge request gitlab-org/gitlab-ee!7249
```
  fcaf056f
- Add CI Job token support to Maven packages API · a3a3c2ff
  Dmitriy Zaporozhets authored Sep 06, 2018
  
  a3a3c2ff
- Merge branch 'feature/git-v2-flag' into 'master' · 2f0a0761
  Nick Thomas authored Sep 06, 2018
```
Add git_v2 flag to GitalyClient

See merge request gitlab-org/gitlab-ce!21520
```
  2f0a0761
- Add git_v2 flag to GitalyClient · c6c6de8a
  James Lopez authored Sep 06, 2018
  
  c6c6de8a
- Add terminal path to job API response · 26f577df
  Steve Azzopardi authored Sep 05, 2018
```
closes #51117
```
  26f577df
- Merge branch 'sh-fix-attachments-inline' into 'master' · abc2caaa
  Nick Thomas authored Sep 06, 2018
```
Fix attachments not displaying inline with Google Cloud Storage

Closes #49957

See merge request gitlab-org/gitlab-ce!21265
```
  abc2caaa
- Merge branch 'pl-fix-ce-ee-upgrade-link-docs' into 'master' · 586fc584
  Marcia Ramos authored Sep 06, 2018
```
Docs: Point "upgrade to EE" link to a dedicated page

See merge request gitlab-org/gitlab-ee!7266
```
  586fc584
- Merge branch 'ash.mckenzie/geo-git-push-ssh-proxy' into 'master' · 228d819b
  Sean McGivern authored Sep 06, 2018
```
Custom Action support

See merge request gitlab-org/gitlab-ce!21034
```
  228d819b
- Merge branch 'ce-to-ee-2018-09-06' into 'master' · 1b69145d
  Bob Van Landuyt authored Sep 06, 2018
```
CE upstream - 2018-09-06 09:22 UTC

See merge request gitlab-org/gitlab-ee!7264
```
  1b69145d
- Merge branch 'bvl-codeowners-file-ce' into 'master' · 98ae35a8
  Douwe Maan authored Sep 06, 2018
```
Port changes for CODEOWNERS to CE

See merge request gitlab-org/gitlab-ce!21309
```
  98ae35a8
- Merge branch 'bvl-codeowners-file' into 'master' · 5e741e4c
  Douwe Maan authored Sep 06, 2018
```
Extract code owners from a CODEOWNERS file

Closes #6961

See merge request gitlab-org/gitlab-ee!6916
```
  5e741e4c
- Resolve conflicts in template_finder.rb · 8dbb497a
  Bob Van Landuyt authored Sep 06, 2018
  
  8dbb497a
- Resolve conflicts in doc/user/markdown.md · 3e0a7a71
  Bob Van Landuyt authored Sep 06, 2018
  
  3e0a7a71
- Merge branch 'ee-29398-support-kubernetes-rbac-for-gitlab-managed-apps' into 'master' · cd5bab6b
  Kamil Trzciński authored Sep 06, 2018
```
EE port for 29398 support kubernetes rbac for gitlab managed apps

See merge request gitlab-org/gitlab-ee!6946
```
  cd5bab6b
- EE port for 29398 support kubernetes rbac for gitlab managed apps · db535764
  Thong Kuah authored Sep 06, 2018
  
  db535764
- Merge branch '29398-support-kubernetes-rbac-for-gitlab-managed-apps' into 'master' · 4ad792de
  Kamil Trzciński authored Sep 06, 2018
```
Enable Kubernetes RBAC for GitLab Managed Apps for existing clusters

See merge request gitlab-org/gitlab-ce!21127
```
  4ad792de
- Enable Kubernetes RBAC for GitLab Managed Apps for existing clusters · 6f2ad2b6
  Thong Kuah authored Sep 06, 2018
  
  6f2ad2b6
- Update locale/gitlab.pot · 4a1c3f42
  Dennis Tang authored Sep 06, 2018
  
  4a1c3f42
- Merge branch 'docs/usage-statistics-typo' into 'master' · a2ea32dd
  Marcia Ramos authored Sep 06, 2018
```
Fix usage statistics typo documentation

See merge request gitlab-org/gitlab-ce!21555
```
  a2ea32dd
- Merge branch 'docs/usage-statistics-typo-ee' into 'master' · f14cfc3f
  Marcia Ramos authored Sep 06, 2018
```
Fix usage statistics typo documentation

See merge request gitlab-org/gitlab-ee!7265
```
  f14cfc3f
- Merge branch '44943-update-presentation-for-sso-providers-on-log-in-page' into 'master' · 857067bb
  Phil Hughes authored Sep 06, 2018
```
Resolve "Update presentation for SSO providers on log in page"

Closes #44943

See merge request gitlab-org/gitlab-ce!21233
```
  857067bb
- Resolve "Update presentation for SSO providers on log in page" · 379c3133
  Martin Wortschack authored Sep 06, 2018
  
  379c3133
- Update app/views/projects/_home_panel.html.haml · 9a5654e8
  Dennis Tang authored Sep 06, 2018
  
  9a5654e8
- Update app/helpers/button_helper.rb · a8dc5afb
  Dennis Tang authored Sep 06, 2018
  
  a8dc5afb
- Update app/assets/stylesheets/framework/variables.scss · 4f74e882
  Dennis Tang authored Sep 06, 2018
  
  4f74e882
- Update app/assets/javascripts/pages/projects/project.js · 35491ba7
  Dennis Tang authored Sep 06, 2018
  
  35491ba7