Commits · master · Jake Krammer / GitLab Enterprise Edition · GitLab

Jul 16, 2018
- Merge branch 'ce-to-ee-2018-07-16' into 'master' · c975e29e
  Grzegorz Bizon authored Jul 16, 2018
  c975e29e
- Resolve conflicts in `locale/gitlab.pot` · 4eb46f10
  Grzegorz Bizon authored Jul 16, 2018
  
  4eb46f10
- Resolve conflicts in mock_data.js · 0f36cbdf
  Grzegorz Bizon authored Jul 16, 2018
  
  0f36cbdf
- Resolve conflicts in environment_entity.rb · b8f653f9
  Grzegorz Bizon authored Jul 16, 2018
  
  b8f653f9
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-16 · cd486031
  🤖 GitLab Bot 🤖 authored Jul 16, 2018
  cd486031
- Merge branch 'patch-28' into 'master' · 05af3768
  Rémy Coutable authored Jul 16, 2018
  05af3768
- Merge branch 'remove-repository-lookup' into 'master' · 690ff8b3
  Sean McGivern authored Jul 16, 2018
  690ff8b3
- Remove Repository#lookup and unreachable rugged code · 37eca765
  Jacob Vosmaer authored Jul 16, 2018 and Sean McGivern committed Jul 16, 2018
  
  37eca765
- Merge branch 'ee-remove-repository-lookup' into 'master' · 2190828c
  Sean McGivern authored Jul 16, 2018
  2190828c
- Remove Repository#lookup and unreachable rugged code (EE version) · b8c9c646
  Jacob Vosmaer authored Jul 16, 2018 and Sean McGivern committed Jul 16, 2018
  
  b8c9c646
- Merge branch 'ce-to-ee-2018-07-16' into 'master' · cd8f4dd5
  Dmytro Zaporozhets (DZ) authored Jul 16, 2018
  cd8f4dd5
- Merge branch... · 01ad732f
  Sean McGivern authored Jul 16, 2018
  01ad732f
- Merge branch 'fix/gb/rename-environments-stop-actions' into 'master' · 6c237350
  Kamil Trzciński authored Jul 16, 2018
  6c237350
- refactor code based on feedback · 97ce0607
  James Lopez authored Jul 16, 2018
  
  97ce0607
- Merge branch 'i18n-extract-app/views/doorkeeper' into 'master' · f73fb244
  Rémy Coutable authored Jul 16, 2018
  f73fb244
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-16 · 9b6915eb
  🤖 GitLab Bot 🤖 authored Jul 16, 2018
  
  9b6915eb
- Merge branch '6807-fix-icon' into 'master' · 2f399411
  Tim Zallmann authored Jul 16, 2018
  2f399411
- Merge branch 'set-build-token-CN' into 'master' · bda16c78
  Rémy Coutable authored Jul 16, 2018
  bda16c78
- Merge branch 'mk/fix-flaky-protected-branch-expectations-ee' into 'master' · 2d087a6f
  Rémy Coutable authored Jul 16, 2018
  2d087a6f
- [EE Port] QA: Remove flaky and redundant expectations · ceedec4d
  Mike Kozono authored Jul 16, 2018 and Rémy Coutable committed Jul 16, 2018
  
  ceedec4d
- Merge branch 'mk/fix-flaky-protected-branch-expectations' into 'master' · 25af7197
  Rémy Coutable authored Jul 16, 2018
  25af7197
- Merge branch 'jprovazn-rails-ci' into 'master' · 62563a39
  Rémy Coutable authored Jul 16, 2018
  62563a39
- Merge branch 'fix/gb/rename-environments-stop-actions-ee' into 'master' · 69a2acfe
  Kamil Trzciński authored Jul 16, 2018
  69a2acfe
- Merge branch 'sh-allow-danger-to-fail' into 'master' · 86456af1
  Rémy Coutable authored Jul 16, 2018
  86456af1
- Merge branch 'fix-danger' into 'master' · c70c20dd
  Rémy Coutable authored Jul 16, 2018
  c70c20dd
- Merge branch '49262-fix-autodevops-link-to-default-chart-docs' into 'master' · e9f9c971
  Kamil Trzciński authored Jul 16, 2018
  e9f9c971
- Trigger rails5 tests either by variable or ref name · d3dcc9d4
  Jan Provaznik authored Jul 13, 2018
  
  d3dcc9d4
- Fix link in help doc which was linking to old mono-repo, now in its own repo · 34ac6806
  Thong Kuah authored Jul 16, 2018
  
  34ac6806
Jul 14, 2018
- Merge branch 'sh-geo-add-more-geo-event-debug-logs' into 'master' · d7eb6972
  Stan Hu authored Jul 14, 2018
  d7eb6972
- Allow Danger step to fail · 470cc8fb
  Stan Hu authored Jul 14, 2018
  470cc8fb
- Merge branch 'ce-to-ee-2018-07-14' into 'master' · 262d60f6
  Stan Hu authored Jul 14, 2018
  262d60f6
- Resolve conflicts in yarn.lock · ba74da3b
  Stan Hu authored Jul 13, 2018
  
  ba74da3b
- Resolve conflicts in package.json · 35ecb168
  Stan Hu authored Jul 13, 2018
  
  35ecb168
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-14 · 3db19c99
  🤖 GitLab Bot 🤖 authored Jul 14, 2018
  3db19c99
- Merge branch 'ce-to-ee-2018-07-14' into 'master' · 0ee7eb7f
  Stan Hu authored Jul 14, 2018
  0ee7eb7f
- Merge branch 'ee-upgrade-frontend-deps' into 'master' · ff2a59c8
  Fatih Acet authored Jul 14, 2018
  ff2a59c8
- EE Port of "Upgrade webpack and other frontend deps" · 99f6710c
  Mike Greiling authored Jul 14, 2018 and Fatih Acet committed Jul 14, 2018
  
  99f6710c
- Merge branch 'upgrade-frontend-deps' into 'master' · fabf6a56
  Fatih Acet authored Jul 14, 2018
  fabf6a56
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-14 · 005bf73e
  🤖 GitLab Bot 🤖 authored Jul 14, 2018
  
  005bf73e
- update webpack to v4.16 · f7737117
  Mike Greiling authored Jul 13, 2018 and Fatih Acet committed Jul 14, 2018
  f7737117