Commits · master · Maël Valais / GitLab Enterprise Edition · GitLab

Mar 26, 2018
- Merge branch 'bvl-classification-only' into 'master' · e78d9834
  Douwe Maan authored Mar 26, 2018
  e78d9834
- Merge branch 'ce-to-ee-2018-03-26' into 'master' · 58ee6fc1
  Stan Hu authored Mar 26, 2018
  58ee6fc1
- Resolve conflicts in config/webpack.config.js · 8132e839
  Stan Hu authored Mar 25, 2018
  
  8132e839
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-26 · c03f4141
  🤖 GitLab Bot 🤖 authored Mar 26, 2018
  c03f4141
Mar 25, 2018
- Merge branch 'ce-to-ee-2018-03-23' into 'master' · b38f4bbf
  Stan Hu authored Mar 25, 2018
  b38f4bbf
- Merge branch '28857-followup-fix-pages-test' into 'master' · 954ad7e9
  Robert Speicher authored Mar 23, 2018 and Stan Hu committed Mar 24, 2018
  954ad7e9
Mar 24, 2018
- Resolve conflicts in app/models/group.rb · 8a5b3f8d
  Stan Hu authored Mar 24, 2018
  
  8a5b3f8d
- Make CE and EE files consistent in spec/initializers/6_validations_spec.rb · f30448e8
  Stan Hu authored Mar 24, 2018
  
  f30448e8
- Resolve conflicts in spec/initializers/6_validations_spec.rb · c6ebb26a
  Stan Hu authored Mar 24, 2018
  
  c6ebb26a
- Resolve conflict in app/helpers/application_settings_helper.rb · 2822861e
  Stan Hu authored Mar 24, 2018
  
  2822861e
Mar 23, 2018
- Merge branch 'mk/geo/fix-disabled-wiki-registry' into 'master' · 368e60da
  Stan Hu authored Mar 23, 2018
  368e60da
- Add changelog · 8626d6a7
  Mike Kozono authored Mar 23, 2018
  
  8626d6a7
- Mark disabled wiki as fully synced · 6829b846
  Mike Kozono authored Mar 23, 2018
  
  6829b846
- Merge branch '4994-geo-log-jid-for-sync-related-jobs' into 'master' · 89d99723
  Stan Hu authored Mar 23, 2018
  89d99723
- Resolve conflict in `safe_model_attributes.yml` · df179a2d
  Bob Van Landuyt authored Mar 23, 2018
  df179a2d
- Merge branch 'blackst0ne-rails5-update-files-by-rails-app-update' into 'master' · 391732a2
  Robert Speicher authored Mar 23, 2018
  391732a2
- Merge branch '28857-followup-fix-pages-test' into 'master' · 93e216e6
  Robert Speicher authored Mar 23, 2018
  93e216e6
- [Geo] Log Sidekiq context for sync related jobs · fe1625bb
  Valery Sizov authored Mar 17, 2018 and Stan Hu committed Mar 23, 2018
  
  fe1625bb
- Merge branch 'mk/geo/mark-disabled-wikis-as-synced' into 'master' · 73d1fab8
  Stan Hu authored Mar 23, 2018
  73d1fab8
- Allow enabling External Policy Control without URL · bab948a3
  Bob Van Landuyt authored Mar 22, 2018
  bab948a3
- Merge branch 'winh-cleanup-comment-submit-test' into 'master' · d6abee51
  Clement Ho authored Mar 23, 2018
  d6abee51
- Merge branch... · 8cdd3a6b
  Stan Hu authored Mar 23, 2018
  8cdd3a6b
- Remove disabled wikis from out-of-sync queries · f49570aa
  Mike Kozono authored Mar 22, 2018
  
  f49570aa
- Resolve conflict on db/schema.rb · 91112906
  Douglas Barbosa Alexandre authored Mar 23, 2018
  
  91112906
- Merge branch... · 4dfeb060
  Clement Ho authored Mar 23, 2018
  4dfeb060
- projects.scss: Fix deviation from CE and move EE only features to EE scss file. · 7409cd53
  Lukas Eipert authored Mar 23, 2018 and Clement Ho committed Mar 23, 2018
  
  7409cd53
- Merge branch... · 9af61b3f
  Filipa Lacerda authored Mar 23, 2018
  9af61b3f
- Fix 500 error when trying to resolve non-ASCII conflicts in editor · 70af1e2e
  Sean McGivern authored Mar 23, 2018
  70af1e2e
- Merge branch '44589-problem-with-prettier-setting-trailingcomma-all' into 'master' · a6507eed
  Filipa Lacerda authored Mar 23, 2018
  a6507eed
- Merge branch 'ee-44589-problem-with-prettier-setting-trailingcomma-all' into 'master' · c63e6801
  Filipa Lacerda authored Mar 23, 2018
  c63e6801
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-23 · b31b7441
  🤖 GitLab Bot 🤖 authored Mar 23, 2018
  b31b7441
- Merge branch 'ce-to-ee-2018-03-23' into 'master' · eedc383f
  Robert Speicher authored Mar 23, 2018
  eedc383f
- Merge branch '5178-geo-verification-rename-log' into 'master' · 7f6a9245
  Stan Hu authored Mar 23, 2018
  7f6a9245
- Use geo.log for secondary repository verification logging · 00d231c4
  rubyjunkie authored Mar 23, 2018 and Stan Hu committed Mar 23, 2018
  
  00d231c4
- ensure stylesheets are included as well, make prettierrc even more inclusive · 72da358e
  Mike Greiling authored Mar 23, 2018
  
  72da358e
- ensure stylesheets are included as well, make prettierrc even more inclusive · f5f6f095
  Mike Greiling authored Mar 23, 2018
  
  f5f6f095
- make babel-transpiled overrides more inclusive and reduce conflicts with EE · 68b6e272
  Mike Greiling authored Mar 23, 2018
  
  68b6e272
- make babel-transpiled overrides more inclusive · d94ba204
  Mike Greiling authored Mar 23, 2018
  
  d94ba204
- Add i18n support for the mrWidget prometheus memory widget · 3cda5c6a
  Jose Ivan Vargas authored Mar 14, 2018
  
  3cda5c6a
- update eslintignore for node scripts · 9eb4d935
  Mike Greiling authored Mar 23, 2018
  
  9eb4d935