Commits · master · fuckte / GitLab Enterprise Edition · GitLab

Oct 30, 2018
- Merge branch 'ee-add-language-param-to-highlight' into 'master' · 73868605
  Douwe Maan authored Oct 30, 2018
  73868605
- Merge branch 'prettify-all-the-ee-things' into 'master' · d041e4f6
  Filipa Lacerda authored Oct 30, 2018
  d041e4f6
- Fix eslint violations · 83827b7d
  Mike Greiling authored Oct 26, 2018
  
  83827b7d
- Run all ee-specific files through prettier · 3cab2087
  Mike Greiling authored Oct 26, 2018
  
  3cab2087
- Merge branch 'ce-to-ee-2018-10-30' into 'master' · fd633eed
  Sean McGivern authored Oct 30, 2018
  fd633eed
- Update imports as per gitlab-ui 1.9.0 upgrade · a029c39b
  Kushal Pandya authored Oct 30, 2018
  
  a029c39b
- Merge branch '7203-sticky-logs-topbar' into 'master' · b09b82f1
  Filipa Lacerda authored Oct 30, 2018
  b09b82f1
- Fix Pod Log topbar position when perf bar is disabled · 2d02e5b8
  Simon Knox authored Oct 30, 2018
  
  2d02e5b8
- Merge branch... · 8598c343
  Filipa Lacerda authored Oct 30, 2018
  8598c343
- Resolve conflicts in Projects::IssuesController · 137a04b3
  Sean McGivern authored Oct 30, 2018
  
  137a04b3
- Resolve merge conflicts · 855d6c50
  Kushal Pandya authored Oct 30, 2018
  
  855d6c50
- Merge branch 'fix-eslint' into 'master' · 6e6c9199
  Filipa Lacerda authored Oct 30, 2018
  6e6c9199
- Add missing new lines · 4f0854c5
  Jan Provaznik authored Oct 30, 2018
  4f0854c5
- Merge remote-tracking branch 'gitlab-ee/master' into dev-master-ee · e600d6b4
  Jan Provaznik authored Oct 30, 2018
  
  e600d6b4
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-30 · 253ca816
  🤖 GitLab Bot 🤖 authored Oct 30, 2018
  253ca816
- Merge branch 'bw-fix-spec-in-merge' into 'master' · 5a953741
  Stan Hu authored Oct 30, 2018
  5a953741
- Merge branch 'ce-to-ee-2018-10-29' into 'master' · cd8b5987
  Stan Hu authored Oct 30, 2018
  cd8b5987
- Allow search results to accept project_id · e73fc904
  Mark Chao authored Oct 16, 2018
  e73fc904
- Centralize loading blob data before highlighting · bf93f3de
  Mark Chao authored Oct 04, 2018
  
  bf93f3de
- Allow FoundBlob to access language from gitattributes · 44a35c2a
  Mark Chao authored Oct 04, 2018
  44a35c2a
- Move :plain option to Highlight class · d2e7b2e9
  Mark Chao authored Sep 11, 2018
  d2e7b2e9
- Make Highlight accept language param · ca82a46a
  Mark Chao authored Sep 06, 2018
  ca82a46a
- Add BlobPresenter for highlighting · 8fa377b0
  Mark Chao authored Sep 06, 2018
  8fa377b0
- Add access to Blob's language from gitattributes · eb83f87f
  Mark Chao authored Sep 06, 2018
  eb83f87f
- Add spec for Gitlab::Git::Repository#attributes · abb24ab3
  Mark Chao authored Sep 05, 2018
  abb24ab3
- Merge branch '8108-disable-default-branch-synchronization-for-pull-mirrors' into 'master' · 6a0e1212
  Stan Hu authored Oct 30, 2018
  6a0e1212
- Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' into 'master' · 67d97e3b
  Evan Read authored Oct 30, 2018
  67d97e3b
- Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ee' into 'master' · 5d0f6420
  Evan Read authored Oct 30, 2018
  5d0f6420
- Merge branch '7858-geo-stale-docs-on-frequency-of-geo-replication-docs' into 'master' · 28497d82
  Evan Read authored Oct 30, 2018
  28497d82
- Don't synchronize default branch for pull mirrors · fbcf8adc
  Douglas Barbosa Alexandre authored Oct 29, 2018 and Stan Hu committed Oct 29, 2018
  fbcf8adc
- Fix problem with spec that showed up in EE merge · c11cb0b3
  Brett Walker authored Oct 29, 2018
  
  c11cb0b3
- Merge branch 'patch-31' into 'master' · af80955b
  Evan Read authored Oct 30, 2018
  af80955b
- Added a note about machine types · 1c53a0fc
  ..:: Mark Veenstra ::.. authored Oct 30, 2018 and Evan Read committed Oct 30, 2018
  
  1c53a0fc
Oct 29, 2018
- Merge branch 'update-gitlab-ui' into 'master' · acb8dc09
  Mike Greiling authored Oct 29, 2018
  acb8dc09
- Update gitlab-ui to 1.9.0 · df587c15
  Clement Ho authored Oct 29, 2018 and Mike Greiling committed Oct 29, 2018
  
  df587c15
- Merge branch '3871-last-part' into 'master' · 9cc8b3ec
  Clement Ho authored Oct 29, 2018
  9cc8b3ec
- Merge branch 'security-redact-links-ee' into 'master' · 525ba37f
  Thiago Presa authored Oct 29, 2018
  525ba37f
- Move ee/spec/javascripts/ee/ to ee/spec/javascripts/ · aa81e280
  Winnie Hellmann authored Oct 29, 2018
  
  aa81e280
- Merge branch '53270-remove-mousetrap-rails' into 'master' · be46fb7e
  Mike Greiling authored Oct 29, 2018
  be46fb7e
- Merge remote-tracking branch 'origin/master' into dev-master · cb9c1bd8
  DJ Mountney authored Oct 29, 2018
  
  cb9c1bd8