Commits · master · Chris Wilson / GitLab Enterprise Edition · GitLab

May 02, 2018
- Merge branch 'ce-to-ee-2018-05-02' into 'master' · 0be466e5
  Rémy Coutable authored May 02, 2018
  0be466e5
- Merge branch 'ee-tz-optimize-emoji-sprite' into 'master' · 3bc72dc8
  Clement Ho authored May 02, 2018
  3bc72dc8
- Merge branch '5856-fix-git-diff-ignore-syntax' into 'master' · 9c25f925
  Rémy Coutable authored May 02, 2018
  9c25f925
- Merge branch 'add-pgbouncer-docs' into 'master' · 59654e0e
  DJ Mountney authored May 02, 2018
  59654e0e
- Properly ignore ee directory · 37c0c929
  Lin Jen-Shin authored May 03, 2018
  
  37c0c929
- Merge branch 'make_spec_admin_sends_notification_spec_reliable' into 'master' · 89f3d450
  Rémy Coutable authored May 02, 2018
  89f3d450
- Actually sign in using warden so that it can also properly sign us out · ee13cad7
  Douwe Maan authored May 02, 2018
  
  ee13cad7
- Merge branch 'unify-ce-application_row' into 'master' · 151cf87e
  Filipa Lacerda authored May 02, 2018
  151cf87e
- Make ee/spec/features/admin/admin_sends_noti fication_spec.rb more · 1af0efba
  Valery Sizov authored May 02, 2018
  1af0efba
- Merge branch... · 0b286515
  Nick Thomas authored May 02, 2018
  0b286515
- Merge branch 'fix-skip-ee-check-for-master' into 'master' · a4e99887
  Rémy Coutable authored May 02, 2018
  a4e99887
- Upgrade pgbouncer documentation · 11ce52d4
  Ian Baum authored May 02, 2018
  11ce52d4
- Use the same approach in CE · 9d553a47
  Lin Jen-Shin authored May 02, 2018
  
  9d553a47
- Fix: Geo: BaseSyncService should prune the @geo-temporary directory before fetching · 73af10c1
  Valery Sizov authored May 02, 2018
  
  73af10c1
- Skip master for EE-specific check · 89a0c23f
  Lin Jen-Shin authored May 02, 2018
  89a0c23f
- Resolve conflicts in a scope of CE-EE merge · 50b99150
  Valery Sizov authored May 02, 2018
  
  50b99150
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-02 · 62b8756d
  🤖 GitLab Bot 🤖 authored May 02, 2018
  62b8756d
- Merge branch 'blackst0ne-replace-spinach-admin-emails.feature' into 'master' · 976e2e11
  Rémy Coutable authored May 02, 2018
  976e2e11
- Replace the `admin/emails.feature` spinach test with an rspec analog · 132340d2
  blackst0ne authored May 02, 2018 and Rémy Coutable committed May 02, 2018
  
  132340d2
- Merge branch 'blackst0ne-replace-spinach-admin-push-rules.feature' into 'master' · 192b08df
  Rémy Coutable authored May 02, 2018
  192b08df
- Replace the `admin/push_rules.feature` spinach test with an rspec analog · 43f69e05
  blackst0ne authored May 02, 2018 and Rémy Coutable committed May 02, 2018
  
  43f69e05
- Merge branch '5682-ee-specific-check' into 'master' · 2c8acf86
  Rémy Coutable authored May 02, 2018
  2c8acf86
- Resolve "Create a new job to check that EE-specific lines are minimal" · fd2ef33d
  Lin Jen-Shin authored May 02, 2018 and Rémy Coutable committed May 02, 2018
  
  fd2ef33d
- Merge branch 'blackst0ne-replace-spinach-project-source-markdown-render.feature' into 'master' · c22a3fa0
  Rémy Coutable authored May 02, 2018
  c22a3fa0
- Replace the `project/source/markdown_render.feature` spinach test with an rspec analog · 4155df1c
  blackst0ne authored May 02, 2018 and Rémy Coutable committed May 02, 2018
  
  4155df1c
- Merge branch 'blackst0ne-rails5-fix-create-service-spec' into 'master' · 8d74af10
  Rémy Coutable authored May 02, 2018
  8d74af10
- [Rails5] Fix spec/services/applications/create_service_spec.rb · 2bf94980
  blackst0ne authored May 02, 2018 and Rémy Coutable committed May 02, 2018
  
  2bf94980
- Merge branch 'blackst0ne-rails5-fix-notification-setting-spec' into 'master' · bdb238a0
  Rémy Coutable authored May 02, 2018
  bdb238a0
- Merge branch 'blackst0ne-rails5-fix-enum-question-mark-methods' into 'master' · 2fe82443
  Rémy Coutable authored May 02, 2018
  2fe82443
- [Rails5] Fix enum question mark methods · 9e78b86d
  blackst0ne authored May 02, 2018 and Rémy Coutable committed May 02, 2018
  
  9e78b86d
- Merge branch 'feature/display-active-sessions' into 'master' · 1350d80c
  Douwe Maan authored May 02, 2018
  1350d80c
- Display and revoke active sessions · 9b33e3d3
  Alexis Reigel authored May 02, 2018
  
  9b33e3d3
- Merge branch 'blackst0ne-rails5-fix-requests-specs' into 'master' · d812ef01
  Rémy Coutable authored May 02, 2018
  d812ef01
- Merge branch 'blackst0ne-rails5-fix-requests-specs-ee' into 'master' · fb18e881
  Rémy Coutable authored May 02, 2018
  fb18e881
- Merge branch 'blackst0ne-rails5-add-touch-later-to-commit-model' into 'master' · da50984b
  Rémy Coutable authored May 02, 2018
  da50984b
- Merge branch 'blackst0ne-rails5-fix-arel-update-manager' into 'master' · 415bf587
  Rémy Coutable authored May 02, 2018
  415bf587
- Merge branch 'blackst0ne-rails5-fix-tzinfo-invalid-timezone-identifier' into 'master' · 3f9bfb0c
  Rémy Coutable authored May 02, 2018
  3f9bfb0c
- Merge branch 'blackst0ne-rails5-use-safe-params-instead-of-params-in-url-for-helpers' into 'master' · aaf2f902
  Rémy Coutable authored May 02, 2018
  aaf2f902
- Merge branch 'blackst0ne-rails5-update-application-controller-log-exception' into 'master' · 023a3816
  Rémy Coutable authored May 02, 2018
  023a3816
- Merge branch 'make-job-lfs-artifacts-read-only' into 'master' · 9ba9c3c8
  Douwe Maan authored May 02, 2018
  9ba9c3c8