Commits · d85dcdb5fb7e909c3d82df9c31ac99615cbd56fa · nexedi / gitlab-ce

05 Feb, 2019 4 commits
- Add enforced_sso feature toggle · d85dcdb5
  James Lopez authored Jan 21, 2019
```
Adds the UI and a feature flag to enable enforced_sso per group.
```
  d85dcdb5
- Automatic merge of gitlab-org/gitlab-ce master · 8e248366
  GitLab Bot authored Feb 05, 2019
  
  8e248366
- Merge branch '57227-absolute-uri-missing-hierarchical-segment' into 'master' · 8e38ca94
  Sean McGivern authored Feb 05, 2019
```
Fix ActionView::Template::Error: Absolute URI missing hierarchical segment

Closes #57227

See merge request gitlab-org/gitlab-ce!24908
```
  8e38ca94
- Merge branch 'docs-fix-audit-badge' into 'master' · c4eb609c
  Evan Read authored Feb 05, 2019
```
Docs: fix Audit Events badge

Closes #9360

See merge request gitlab-org/gitlab-ee!9296
```
  c4eb609c
04 Feb, 2019 36 commits
- Generalize language to include SaaS plan · 11b4c6e2
  cynthiang authored Feb 04, 2019
  
  11b4c6e2
- Automatic merge of gitlab-org/gitlab-ce master · 51c89e8d
  GitLab Bot authored Feb 04, 2019
  
  51c89e8d
- Merge branch 'update-pages-extensionless-urls' into 'master' · 7f880007
  Evan Read authored Feb 04, 2019
```
Add support for extensionless pages URLs

See merge request gitlab-org/gitlab-ce!24876
```
  7f880007
- Catch possible Addressable::URI::InvalidURIError · 7e25ff30
  Brett Walker authored Feb 04, 2019
  
  7e25ff30
- Automatic merge of gitlab-org/gitlab-ce master · 429c2e64
  GitLab Bot authored Feb 04, 2019
  
  429c2e64
- Merge branch 'renovate/gitlab-ui-2.x' into 'master' · 4b07f22d
  Annabel Dunstone Gray authored Feb 04, 2019
```
Update dependency @gitlab/ui to ^2.0.2

See merge request gitlab-org/gitlab-ce!24915
```
  4b07f22d
- Automatic merge of gitlab-org/gitlab-ce master · fd25e8b7
  GitLab Bot authored Feb 04, 2019
  
  fd25e8b7
- Merge branch 'ssh-host-key-indifferent' into 'master' · 4d6f447f
  Stan Hu authored Feb 04, 2019
```
Allow SshHostKey.find_by to accept string keys

See merge request gitlab-org/gitlab-ce!24903
```
  4d6f447f
- Update dependency @gitlab/ui to ^2.0.2 · c7f79308
  Lukas 'Eipi' Eipert authored Feb 04, 2019
  
  c7f79308
- Automatic merge of gitlab-org/gitlab-ce master · 52ad0aa1
  GitLab Bot authored Feb 04, 2019
  
  52ad0aa1
- Merge branch 'adriel-handle-echarts-resize-events' into 'master' · fe76bb29
  Phil Hughes authored Feb 04, 2019
```
Handle metrics graph resize events

See merge request gitlab-org/gitlab-ce!24649
```
  fe76bb29
- Merge branch 'ee-adriel-handle-echarts-resize-events' into 'master' · 77d48545
  Phil Hughes authored Feb 04, 2019
```
EE Compatibility Port: CE Handle window and container resize events

See merge request gitlab-org/gitlab-ee!9399
```
  77d48545
- Merge branch 'fe-api-group-members' into 'master' · e5347172
  Phil Hughes authored Feb 04, 2019
```
Add groupMembers to api.js

See merge request gitlab-org/gitlab-ce!24892
```
  e5347172
- Merge branch 'tz-gitlab-ui-include' into 'master' · ad513afc
  Phil Hughes authored Feb 04, 2019
```
gitlab-ui update with the new charting setup

Closes #56987

See merge request gitlab-org/gitlab-ce!24807
```
  ad513afc
- gitlab-ui update with the new charting setup · 65088f4c
  Tim Zallmann authored Feb 04, 2019
  
  65088f4c
- Merge branch 'ee-tz-gitlab-ui-include' into 'master' · 489e31d0
  Phil Hughes authored Feb 04, 2019
```
EE Port of updated gitlab-ui import for charts

See merge request gitlab-org/gitlab-ee!9371
```
  489e31d0
- Merge branch 'pl-refactor-prometheus-alert-fired-email' into 'master' · 474f7ef2
  Sean McGivern authored Feb 04, 2019
```
Refactor sending Prometheus alert mails

See merge request gitlab-org/gitlab-ee!9407
```
  474f7ef2
- Refactor sending Prometheus alert mails · c069134f
  Peter Leitzen authored Feb 04, 2019
  
  c069134f
- Automatic merge of gitlab-org/gitlab-ce master · 71e6a91a
  GitLab Bot authored Feb 04, 2019
  
  71e6a91a
- Merge branch 'fj-regression-external-wiki-url' into 'master' · 7ffbfeb1
  Rémy Coutable authored Feb 04, 2019
```
Changed external wiki query method to prevent attribute caching

Closes #57228

See merge request gitlab-org/gitlab-ce!24907
```
  7ffbfeb1
- Automatic merge of gitlab-org/gitlab-ce master · 681d537f
  GitLab Bot authored Feb 04, 2019
  
  681d537f
- Merge branch 'gt-externalize-app-views-instance_statistics' into 'master' · 11f9edec
  Fatih Acet authored Feb 04, 2019
```
Externalize strings from `/app/views/instance_statistics`

See merge request gitlab-org/gitlab-ce!24809
```
  11f9edec
- Merge branch 'gt-externalize-app-views-instance_statistics-ee' into 'master' · 534b58ca
  Fatih Acet authored Feb 04, 2019
```
Externalize strings from `/app/views/instance_statistics`

See merge request gitlab-org/gitlab-ee!9370
```
  534b58ca
- Automatic merge of gitlab-org/gitlab-ce master · 73c1f387
  GitLab Bot authored Feb 04, 2019
  
  73c1f387
- Changed external wiki query method to prevent attribute caching · 247bd122
  Francisco Javier López authored Feb 04, 2019
  
  247bd122
- Merge branch 'update-workhorse-8-2-0' into 'master' · 7fe37534
  Sean McGivern authored Feb 04, 2019
```
Update Workhorse to v8.2.0

See merge request gitlab-org/gitlab-ce!24909
```
  7fe37534
- Merge branch '8621-new-feature-flag-vue-with-be-fix' into 'master' · bcca5551
  Sean McGivern authored Feb 04, 2019
```
Add feature specs for multiple environment feature flag

See merge request gitlab-org/gitlab-ee!9357
```
  bcca5551
- Merge branch 'feature/gb/enable-cross-project-pipeline-triggers' into 'master' · 3fec038d
  Sean McGivern authored Feb 04, 2019
```
Enable cross-project pipeline triggers by default

See merge request gitlab-org/gitlab-ee!9374
```
  3fec038d
- Automatic merge of gitlab-org/gitlab-ce master · ebfa279c
  GitLab Bot authored Feb 04, 2019
  
  ebfa279c
- Merge branch 'fe-update-common-styles' into 'master' · e69d9db5
  Annabel Dunstone Gray authored Feb 04, 2019
```
Replace h-13em with h-12em

See merge request gitlab-org/gitlab-ce!24895
```
  e69d9db5
- Automatic merge of gitlab-org/gitlab-ce master · d93553c6
  GitLab Bot authored Feb 04, 2019
  
  d93553c6
- Update Workhorse to v8.2.0 · 01103ea0
  Nick Thomas authored Feb 04, 2019
  
  01103ea0
- Merge branch 'ce-mr-widget-service-endpoints-method' into 'master' · 280b6f6f
  Phil Hughes authored Feb 04, 2019
```
CE Port of "Extract extension method from mr_widget_options"

See merge request gitlab-org/gitlab-ce!24891
```
  280b6f6f
- Merge branch 'mr-widget-service-endpoints-method' into 'master' · 4576a4cb
  Phil Hughes authored Feb 04, 2019
```
Extract extension method from mr_widget_options

See merge request gitlab-org/gitlab-ee!9411
```
  4576a4cb
- Automatic merge of gitlab-org/gitlab-ce master · 982c1125
  GitLab Bot authored Feb 04, 2019
  
  982c1125
- Merge branch... · cf40530e
  Rémy Coutable authored Feb 04, 2019
```
Merge branch '46448-add-timestamps-for-each-stage-of-gitlab-rake-gitlab-backup-restore' into 'master'

Resolve "Add timestamps for each stage of gitlab-rake gitlab:backup:restore"

Closes #46448

See merge request gitlab-org/gitlab-ce!19684
```
  cf40530e