Commits · v10.2.5-ee · Mike Kobit / GitLab Enterprise Edition · GitLab

Dec 15, 2017
- Update VERSION to 10.2.5-ee · 3ec4b67f
  Mike Kozono authored Dec 15, 2017
  
  View commits for tag v10.2.5-ee v10.2.5-ee
  3ec4b67f
- Update CHANGELOG.md for 10.2.5 · 9f8471b3
  Mike Kozono authored Dec 15, 2017
  9f8471b3
- Update CHANGELOG-EE.md for 10.2.5-ee · 0f3f56d0
  Mike Kozono authored Dec 15, 2017
  0f3f56d0
- Merge branch '10-2-stable-ee-patch-5' into '10-2-stable-ee' · ebcfbf21
  Mike Kozono authored Dec 15, 2017
  ebcfbf21
Dec 14, 2017
- Fix feature spec user_creates_merge_request_spec.rb · 72923665
  Winnie Hellmann authored Dec 14, 2017
  
  72923665
- Fixed test · 89847856
  Francisco Javier López authored Dec 14, 2017
  
  89847856
- Resolve conflict in lib/gitlab/shell.rb · e01eaf85
  Mike Kozono authored Dec 14, 2017
  
  e01eaf85
- Resolve conflict in app/views/projects/issues/show.html.haml · 46ab62fd
  Mike Kozono authored Dec 14, 2017
  
  46ab62fd
- Resolve conflict in VERSION · 9293ea61
  Mike Kozono authored Dec 14, 2017
  
  9293ea61
- Merge remote-tracking branch 'ce/10-2-stable-patch-5' into 10-2-stable-ee-patch-5 · eaadd327
  Mike Kozono authored Dec 14, 2017
  eaadd327
- Merge branch 'sh-optimize-groups-api-10-2' into '10-2-stable-patch-5' · ce916f47
  Winnie Hellmann authored Dec 14, 2017
  ce916f47
- Solved copy/paste error! · 1f804797
  Francisco Javier López authored Dec 14, 2017
  
  1f804797
- Merge branch 'bvl-fork-networks-for-deleted-projects-10-2' into '10-2-stable-patch-5' · eb98a6f6
  Winnie Hellmann authored Dec 14, 2017
  eb98a6f6
- Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version-10-2'... · b452d57e
  Winnie Hellmann authored Dec 14, 2017
  b452d57e
- Resolving conflict · 9119c363
  Francisco Javier López authored Dec 14, 2017
  
  9119c363
- Resolving conflict · ebfe269e
  Francisco Javier López authored Dec 14, 2017
  
  ebfe269e
- Resolving conflict · a673d25d
  Francisco Javier López authored Dec 14, 2017
  
  a673d25d
- Resolve conflicts in `populate_fork_networks_range.rb` · 5708bd6c
  Bob Van Landuyt authored Dec 14, 2017
  
  5708bd6c
- Merge branch 'bvl-fork-networks-for-deleted-projects' into 'master' · 341f953b
  Sean McGivern authored Nov 29, 2017
  341f953b
- Resolve conflict in config/initializers/7_prometheus_metrics.rb · 11d1876f
  Winnie Hellmann authored Dec 14, 2017
  
  11d1876f
- Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master' · 2c799569
  Stan Hu authored Dec 07, 2017
  2c799569
- Merge branch 'sh-optimize-groups-api' into 'master' · f798169c
  Douwe Maan authored Dec 04, 2017
  f798169c
- Cherry pick lib/api/entities.rb from 763ea26d · 1126fd04
  Kamil Trzciński authored Nov 28, 2017
  
  1126fd04
- Merge branch 'winh-upgrade-codeclimate' into 'master' · 4552bb43
  Rémy Coutable authored Nov 28, 2017
  4552bb43
- Merge branch 'winh-10-2-ce-ee-update-docs' into 'master' · cb162050
  Mike Kozono authored Dec 13, 2017
  cb162050
- Merge branch 'ee-40285-prometheus-loading-screen-no-longer-seems-to-appear' into 'master' · 8528c97b
  Tim Zallmann authored Dec 13, 2017
  8528c97b
- Merge branch 'ee-40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master' · 0f90770f
  Jacob Schatz authored Dec 07, 2017
  0f90770f
- Merge branch 'issue_40654-ee' into 'master' · fccf738a
  Sean McGivern authored Dec 06, 2017
  fccf738a
- Merge branch 'slack-app-docs-direct-link' into 'master' · 231806fa
  Achilleas Pipinellis authored Nov 29, 2017
  231806fa
- Merge branch 'add-board-scope-highlight' into 'master' · 25b0e04f
  Sean McGivern authored Dec 06, 2017
  25b0e04f
- Merge branch 'sh-bump-prometheus-gem-properly' into 'master' · 3b971cf6
  Robert Speicher authored Dec 11, 2017
  3b971cf6
- Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' into 'master' · f39ccebe
  Tim Zallmann authored Dec 13, 2017
  f39ccebe
- Merge branch 'sh-fix-import-rake-task' into 'master' · d463c6a9
  James Lopez authored Dec 11, 2017
  d463c6a9
- Merge branch 'sh-bump-redis-actionpack' into 'master' · b14be0bf
  Robert Speicher authored Dec 06, 2017
  b14be0bf
- Merge branch 'backport-board-scope-highlight' into 'master' · ea6d3ae5
  Sean McGivern authored Dec 06, 2017
  ea6d3ae5
- Merge branch '40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master' · 957bf2a7
  Jacob Schatz authored Dec 07, 2017
  957bf2a7
- Merge branch '40715-updateendpoint-undefined-on-issue-page' into 'master' · e9267131
  Clement Ho authored Dec 07, 2017
  e9267131
- Merge branch '40592-dropdown-options-are-misaligned' into 'master' · bcc583b8
  Clement Ho authored Dec 07, 2017
  bcc583b8
- Merge branch '40711-fix-forking-hashed-projects' into 'master' · e097ab5a
  Douwe Maan authored Dec 04, 2017
  e097ab5a
- Merge branch 'bvl-double-fork' into 'master' · ceefe7fb
  Phil Hughes authored Nov 29, 2017
  ceefe7fb