Commits · master · Fodor Zoltan / GitLab Enterprise Edition · GitLab

May 02, 2018
- 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-rails5-fix-requests-specs-ee' into 'master' · fb18e881
  Rémy Coutable authored May 02, 2018
  fb18e881
- Merge branch 'jej/omniauth-provider-for-group-saml' into 'master' · 8a647c55
  Douwe Maan authored May 02, 2018
  8a647c55
- Merge branch 'jr-33320-lfs-settings-interface-ee' into 'master' · 91180dfe
  Douwe Maan authored May 02, 2018
  91180dfe
May 01, 2018
- Merge branch 'ce-to-ee-2018-05-01' into 'master' · f43f4197
  Robert Speicher authored May 01, 2018
  f43f4197
- Resolve spec/requests/api/discussions_spec.rb · c88e51d3
  Robert Speicher authored May 01, 2018
  
  c88e51d3
- Resolve spec/helpers/auth_helper_spec.rb · 7766995f
  Robert Speicher authored May 01, 2018
  
  7766995f
- Resolve lib/api/discussions.rb · bf7a354f
  Robert Speicher authored May 01, 2018
  
  bf7a354f
- Resolve app/helpers/auth_helper.rb · f61463dc
  Robert Speicher authored May 01, 2018
  
  f61463dc
- Resolve doc/api/discussions.md · ffacc675
  Robert Speicher authored May 01, 2018
  
  ffacc675
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-01 · a5835110
  🤖 GitLab Bot 🤖 authored May 01, 2018
  a5835110
- Merge branch '45806-improve-karma-performance' into 'master' · b8a84830
  Clement Ho authored May 01, 2018
  b8a84830
- Fix memory and performance issues in Karma test suite · 6b1e4ad5
  Mike Greiling authored May 01, 2018 and Clement Ho committed May 01, 2018
  
  6b1e4ad5
- Merge branch 'qa/gb/fix-repository-location-in-squash-specs' into 'master' · e5fc2b1e
  Robert Speicher authored May 01, 2018
  e5fc2b1e
- Group SAML Omniauth Provider · 1c812850
  James Edwards-Jones authored Apr 23, 2018
  
  1c812850
- Merge branch 'qa/rs-bump-nokogiri' into 'master' · 71d53ebc
  Grzegorz Bizon authored May 01, 2018
  71d53ebc
- Merge branch 'gitaly-0.96.2' into 'master' · 78b2f47e
  Robert Speicher authored May 01, 2018
  78b2f47e
- Merge branch 'ce-to-ee-2018-05-01' into 'master' · 23f8f6f8
  Robert Speicher authored May 01, 2018
  23f8f6f8
- Merge branch 'dm-commit-trailer-without-gravatar' into 'master' · 5b92d405
  Robert Speicher authored May 01, 2018
  5b92d405
- Bump nokogiri to 1.8.2 in qa Gemfile · 5ed0e4b4
  Robert Speicher authored May 01, 2018
  5ed0e4b4
- Resolve conflicts in doc/README.md · 38ecf364
  Robert Speicher authored May 01, 2018
  
  38ecf364
- Merge branch 'gitlab-workhorse-4.2.0' into 'master' · 110a3779
  Douwe Maan authored May 01, 2018
  110a3779
- Port of jr-33320-lfs-settings-interface to EE · 2490cef0
  James Ramsay authored Apr 24, 2018
  2490cef0
- Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master' · 202c100d
  Douwe Maan authored May 01, 2018
  202c100d
- Merge branch '5224-remove-use_system_git_for_fetch' into 'master' · 13dba821
  Nick Thomas authored May 01, 2018
  13dba821
- Merge branch 'geo-dr-fix' into 'master' · ef44e5cc
  Nick Thomas authored May 01, 2018
  ef44e5cc
- Fix conflicts · ee909b5f
  Victor Wu authored May 01, 2018
  
  ee909b5f
- Merge branch 'helm-add-alpine-mirrors' into 'master' · 1134f540
  Kamil Trzciński authored May 01, 2018
  1134f540
- Use gitlab-workhorse 4.2.0 · 8cb6f4f2
  Jacob Vosmaer authored May 01, 2018
  
  8cb6f4f2
- Merge branch '5466-geo-prometheus-metrics-for-checksummed-verification-is-confusing' into 'master' · 52e86a42
  Nick Thomas authored May 01, 2018
  52e86a42
- Resolve "Geo: Prometheus metrics for checksummed/verification is confusing" · 314bbca3
  Douglas Barbosa Alexandre authored May 01, 2018
  
  314bbca3
- Merge branch 'jprovazn-commit-notes-api' into 'master' · bdc20840
  Douwe Maan authored May 01, 2018
  bdc20840
- Merge request and commit discussions API · 7a76caa5
  Jan Provaznik authored May 01, 2018
  
  7a76caa5
- Merge branch 'ee-jprovazn-commit-notes-api' into 'master' · e1c8d698
  Douwe Maan authored May 01, 2018
  e1c8d698
- [EE] Discussion API for merge requests and commits · 507430cd
  Jan Provaznik authored May 01, 2018
  
  507430cd