Commits · f2f58a60b76acd479e37bdbc9246ec9f9b2bea82 · Boxiang Sun / gitlab-ce

08 Nov, 2017 7 commits
- Merge branch 'fl-cleanup-test' into 'master' · f2f58a60
  Tim Zallmann authored Nov 08, 2017
```
Cleanup tests

See merge request gitlab-org/gitlab-ce!15261
```
  f2f58a60
- Merge branch 'tc-delete-merged-protected-tags-fix' into 'master' · ea4cf98c
  Douwe Maan authored Nov 08, 2017
```
When deleting merged branches, ignore protected tags

Closes #39732

See merge request gitlab-org/gitlab-ce!15252
```
  ea4cf98c
- Merge branch 'bvl-free-paths' into 'master' · de614b0e
  Douwe Maan authored Nov 08, 2017
```
Free some reserved group routes

See merge request gitlab-org/gitlab-ce!15052
```
  de614b0e
- Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'master' · cb606c5a
  Stan Hu authored Nov 08, 2017
```
Make BackgroundTransaction#labels public

See merge request gitlab-org/gitlab-ce!15257
```
  cb606c5a
- Merge branch 'jivl-fix-karma-config-file' into 'master' · a979153b
  Mike Greiling authored Nov 08, 2017
```
fix karma config file

See merge request gitlab-org/gitlab-ce!15263
```
  a979153b
- Merge branch 'ux-guide-components-modal' into 'master' · a845cf24
  Marcia Ramos authored Nov 08, 2017
```
Modals in UX guide

See merge request gitlab-org/gitlab-ce!14886
```
  a845cf24
- Merge branch 'add-typescript' into 'master' · 2f644452
  Stan Hu authored Nov 08, 2017
```
Adds typescript support in webpack. With Mike G.

See merge request gitlab-org/gitlab-ce!15264
```
  2f644452
07 Nov, 2017 33 commits
- Remove comments in JSON. · 98b6175e
  Jacob Schatz authored Nov 07, 2017
  
  98b6175e
- Add changelog · 430c42e1
  Jacob Schatz authored Nov 07, 2017
  
  430c42e1
- Adds typescript support in webpack. With Mike G. · c2555e72
  Jacob Schatz authored Nov 07, 2017
  
  c2555e72
- Merge branch 'docs-add-glcom-reg-restictions' into 'master' · ac4a976c
  Marcia Ramos authored Nov 07, 2017
```
Add note on registry restrictions on GitLab.com

See merge request gitlab-org/gitlab-ce!15174
```
  ac4a976c
- Add note on registry restrictions on GitLab.com · b67d7295
  Chenjerai Katanda authored Nov 07, 2017
  
  b67d7295
- Merge branch '37824-many-branches-lock-server' into 'master' · d9313795
  Annabel Dunstone Gray authored Nov 07, 2017
```
Project with many branches can lock server running "git branch --contains XXX"

Closes #37824

See merge request gitlab-org/gitlab-ce!14812
```
  d9313795
- fix karma config file · 4bd90ec3
  Jose Ivan Vargas authored Nov 07, 2017
  
  4bd90ec3
- Remove truncate mixin · fb41187b
  Annabel Dunstone Gray authored Nov 07, 2017
  
  fb41187b
- Update mr_widget_options_spec.js · 1aa4604f
  Filipa Lacerda authored Nov 07, 2017
  
  1aa4604f
- Change cursor to pointer on hover · a613b19b
  tauriedavis authored Nov 07, 2017
  
  a613b19b
- Simplify design for no tags, branches · 2acfb614
  tauriedavis authored Nov 07, 2017
  
  2acfb614
- Merge branch 'add-ingress-to-cluster-applications' into 'master' · 673b6be1
  Kamil Trzciński authored Nov 07, 2017
```
Add Ingress to cluster applications section

See merge request gitlab-org/gitlab-ce!15185
```
  673b6be1
- Cleanup tests · 2a6c8647
  Filipa Lacerda authored Nov 07, 2017
  
  2a6c8647
- Merge branch '10.2-templates-vendoring' into 'master' · 244ced48
  Kamil Trzciński authored Nov 07, 2017
```
Upgrade vendored templates for 10.2

See merge request gitlab-org/gitlab-ce!15259
```
  244ced48
- Merge branch 'feature/hashed-storage-repo-import' into 'master' · ed000b5f
  Nick Thomas authored Nov 07, 2017
```
Improve GitLab Import rake task to work with Hashed Storage and Subgroups

Closes #36509

See merge request gitlab-org/gitlab-ce!15157
```
  ed000b5f
- Improve GitLab Import rake task to work with Hashed Storage and Subgroups · 1c8af321
  James Lopez authored Nov 07, 2017
  
  1c8af321
- Upgrade vendored templates · 761a403d
  Alessio Caiazza authored Nov 07, 2017
  
  761a403d
- Remove EE-specific group paths · 9b0899cb
  Bob Van Landuyt authored Nov 07, 2017
  
  9b0899cb
- Check redirecting with a querystring · 2414c69e
  Bob Van Landuyt authored Nov 07, 2017
  
  2414c69e
- Update failure message when finding new routes in `PathRegex` · e070e216
  Bob Van Landuyt authored Oct 27, 2017
  
  e070e216
- Free up some group reserved words · 58d1d6a5
  Bob Van Landuyt authored Oct 27, 2017
  
  58d1d6a5
- Free up `avatar`, `group_members` and `milestones` as paths · 5dde0536
  Bob Van Landuyt authored Oct 26, 2017
  
  5dde0536
- Free up `labels` as a group name · 5d14337b
  Bob Van Landuyt authored Oct 26, 2017
  
  5d14337b
- Add helper methods to redirect legacy paths · 414c4e3f
  Bob Van Landuyt authored Oct 26, 2017
  
  414c4e3f
- Merge branch 'fix-comments-spec' into 'master' · 3a8cf276
  Rémy Coutable authored Nov 07, 2017
```
Fix merge_request_spec

See merge request gitlab-org/gitlab-ce!15250
```
  3a8cf276
- Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-applications · 6a8a3f25
  Kamil Trzcinski authored Nov 07, 2017
  
  6a8a3f25
- Fix db/schema.rb · fa3af6de
  Kamil Trzcinski authored Nov 07, 2017
  
  fa3af6de
- Merge branch '38464-k8s-apps' into 'master' · d9a1dc3d
  Kamil Trzciński authored Nov 07, 2017
```
Add support for k8s cluster applications - Helm tiller installation

See merge request gitlab-org/gitlab-ce!14908
```
  d9a1dc3d
- Add feature spec for Ingress · 3940fa0d
  Eric Eastwood authored Nov 07, 2017
  
  3940fa0d
- Make BackgroundTransaction#labels public · 90edcb45
  Pawel Chojnacki authored Nov 07, 2017
```
as are all other Transaction implementations
```
  90edcb45
- Addresses frontend comments. · 28fcf777
  Mayra Cabrera authored Nov 07, 2017
```
Make small improvements over well.css files
```
  28fcf777
- Merge branch '39798-revert-gear-animation' into 'master' · b16c2ef7
  Clement Ho authored Nov 07, 2017
```
Revert Auto DevOps gear animation

Closes #39798

See merge request gitlab-org/gitlab-ce!15232
```
  b16c2ef7
- Fix merge_request_spec · a2e2b11c
  Annabel Dunstone Gray authored Nov 07, 2017
  
  a2e2b11c