Commits · master · Thomas Grainger / GitLab Enterprise Edition · GitLab

Jun 29, 2016
- Merge branch 'mrchrisw/log-location' into 'master' · a9d0265b
  Achilleas Pipinellis authored Jun 29, 2016
  a9d0265b
- Merge branch 'ce_upstream1' into 'master' · f00c8ede
  Valery Sizov authored Jun 29, 2016
  f00c8ede
- Fix log location for audit_events · 51090bea
  Chris authored Jun 29, 2016
  
  51090bea
Jun 28, 2016
- Merge remote-tracking branch 'dev/master' · 8fe819da
  Robert Speicher authored Jun 28, 2016
  
  8fe819da
- Update CHANGELOG-EE for 8.9.2, 8.8.6, and 8.7.8 · 489a5591
  Robert Speicher authored Jun 28, 2016
  489a5591
- Merge branch 'restore-kerberos-8.8' into 'master' · 94f7e2a8
  Douwe Maan authored Jun 28, 2016
  94f7e2a8
- Merge branch... · d2bb3c22
  Rémy Coutable authored Jun 28, 2016
  d2bb3c22
- Recovery JiraIssue class · 3a0f447c
  Valery Sizov authored Jun 28, 2016
  
  3a0f447c
- Roll back Grack::Auth to fix Git HTTP SPNEGO · 941e578c
  Jacob Vosmaer authored Jun 28, 2016
  
  941e578c
- Fix MR creation on fork of deleted project · 2396e4cc
  Sean McGivern authored Jun 28, 2016
  2396e4cc
- Merge branch 'ce_upstream1' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream1 · 886d4999
  Valery Sizov authored Jun 28, 2016
  
  886d4999
- Remove methods thare were removed in CE · 111e7949
  Valery Sizov authored Jun 28, 2016
  
  111e7949
- Merge branch 'fix/attr-encrypted-ee-issue' into 'master' · b6ddf37d
  Rémy Coutable authored Jun 28, 2016
  b6ddf37d
- added changelog · b7f8512c
  James Lopez authored Jun 28, 2016
  
  b7f8512c
- fix attr_encrypted in EE · 1b33bb44
  James Lopez authored Jun 28, 2016
  
  1b33bb44
Jun 27, 2016
- Merge branch 'fix-18997' into 'master' · ae6ec1fd
  Robert Speicher authored Jun 27, 2016
  ae6ec1fd
- Fix admin nav merge conflict · 8c76d845
  Annabel Dunstone Gray authored Jun 27, 2016
  
  8c76d845
- Fix conflict resolving · 6fab5364
  Valery Sizov authored Jun 27, 2016
  
  6fab5364
- Fix conflict resolving in Gemfile.lock · 0e786e30
  Valery Sizov authored Jun 27, 2016
  
  0e786e30
- Fix conflict in app/views/layouts/nav/_group_settings.html.haml · cb06ea82
  Rémy Coutable authored Jun 27, 2016
  cb06ea82
- Resolve doc/README.md conflicts · 043d9ecf
  Achilleas Pipinellis authored Jun 27, 2016
  
  043d9ecf
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream1 · 23bb3787
  Valery Sizov authored Jun 27, 2016
  
  23bb3787
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream · 828c218f
  Valery Sizov authored Jun 27, 2016
  
  828c218f
- Merge branch '2979-document-2fa-auth-changes' into 'master' · 0115ab7f
  Achilleas Pipinellis authored Jun 27, 2016
  0115ab7f
- Merge branch 'refactor/ci-config-add-entry-error' into 'master' · a9dbd394
  Rémy Coutable authored Jun 27, 2016
  a9dbd394
- Merge branch 'remove-unused-templates-from-gitlab-ci' into 'master' · 030db5c3
  Rémy Coutable authored Jun 27, 2016
  030db5c3
- Add notices about disabling auth features for users with 2FA. · f7fc352b
  Timothy Andrew authored Jun 21, 2016
  
  f7fc352b
Jun 26, 2016
- Merge branch 'add-debugging-tips' into 'master' · c5295f96
  Achilleas Pipinellis authored Jun 26, 2016
  c5295f96
- Break up Snippet's Elastic "search snippets by code" spec · 0aeeac31
  Robert Speicher authored Jun 26, 2016
  
  0aeeac31
- Clean up some unused templates imported from GitLab CI · ed713c81
  Takuya Noguchi authored Jun 26, 2016
  
  ed713c81
- Merge branch 'patch-1' into 'master' · 6acdf1fc
  Stan Hu authored Jun 26, 2016
  6acdf1fc
- Update CHANGELOG-EE for 8.9.1 · 80a16d49
  Robert Speicher authored Jun 25, 2016
  80a16d49
- Update CHANGELOG for 8.9.1 · 81fd9149
  Robert Speicher authored Jun 25, 2016
  81fd9149
- Removed unneeded word · fa60c18a
  Ian Lee authored Jun 26, 2016
  
  fa60c18a
Jun 25, 2016
- Merge branch 'issue_19096' into 'master' · 4c767bab
  Stan Hu authored Jun 25, 2016
  4c767bab
Jun 24, 2016
- Validate presence of essential params for diff rendering · 7627cc19
  Ruben Alexis authored Jun 24, 2016
  7627cc19
- Merge branch 'issue_15588' into 'master' · f0ed8930
  Jacob Schatz authored Jun 24, 2016
  f0ed8930
- Merge branch 'upgrade-sentry' into 'master' · 5f678ae4
  Robert Speicher authored Jun 24, 2016
  5f678ae4
- Merge branch 'js-content-for' into 'master' · e45d6043
  Jacob Schatz authored Jun 24, 2016
  e45d6043
- Merge branch 'add-smtp-setting' into 'master' · 3fe7ee7a
  Stan Hu authored Jun 24, 2016
  3fe7ee7a