Commits · d62ed6c4aee7a96877a7478055b8c36f579cbdf3 · nexedi / gitlab-ce

27 Apr, 2018 3 commits
- Adds spec for omni_auth jwt strategy · d62ed6c4
  Tiago Botelho authored Apr 26, 2018
  
  d62ed6c4
- Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite · dee2dd03
  Tiago Botelho authored Apr 25, 2018
  
  dee2dd03
- Merge branch 'ce-to-ee-2018-04-26' into 'master' · 8d3d46dc
  Rémy Coutable authored Apr 27, 2018
```
CE upstream - 2018-04-26 19:29 UTC

Closes gitlab-ce#22693

See merge request gitlab-org/gitlab-ee!5491
```
  8d3d46dc
26 Apr, 2018 29 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-26 · d27a5b20
  GitLab Bot authored Apr 26, 2018
  
  d27a5b20
- Merge branch 'winh-dashboard-any-milestone' into 'master' · c73b5d31
  Phil Hughes authored Apr 26, 2018
```
Reset milestone filter when clicking "Any Milestone" in dashboard

Closes #45295

See merge request gitlab-org/gitlab-ce!18531
```
  c73b5d31
- Reset milestone filter when clicking "Any Milestone" in dashboard · b5e4cd86
  Winnie Hellmann authored Apr 26, 2018
  
  b5e4cd86
- Merge branch 'pravi/gitlab-ce-remove-vendored-peek' into 'master' · b666b2fe
  Sean McGivern authored Apr 26, 2018
```
Remove `peek-performance_bar` from the performance bar

See merge request gitlab-org/gitlab-ce!18597
```
  b666b2fe
- Merge branch '5514-fix-epic-collapsed-sidebar-label-click' into 'master' · 4a56c554
  Filipa Lacerda authored Apr 26, 2018
```
Reveal labels dropdown when labels icon is clicked on collapsed Epic sidebar

Closes #5514

See merge request gitlab-org/gitlab-ee!5298
```
  4a56c554
- Merge branch 'docs/edge-label-to-quality' into 'master' · 1921edb1
  Rémy Coutable authored Apr 26, 2018
```
Rename the Edge label to Quality

See merge request gitlab-org/gitlab-ce!18457
```
  1921edb1
- Rename the Edge label to Quality · e3f7e882
  Rémy Coutable authored Apr 26, 2018
  
  e3f7e882
- Merge branch 'delete-object-state-models' into 'master' · a52cb59d
  Sean McGivern authored Apr 26, 2018
```
Delete object_state_models.md

See merge request gitlab-org/gitlab-ce!18588
```
  a52cb59d
- Merge branch 'fix-calendar' into 'master' · 9b8c0de8
  Mike Greiling authored Apr 26, 2018
```
Fix calendar day position

See merge request gitlab-org/gitlab-ce!18516
```
  9b8c0de8
- Fix calendar day position · 823368b3
  Clement Ho authored Apr 26, 2018
  
  823368b3
- Merge branch 'restore-size-and-position-for-fork-icon' into 'master' · aed4270f
  Rémy Coutable authored Apr 26, 2018
```
Restore size and position for fork icon

See merge request gitlab-org/gitlab-ce!18449
```
  aed4270f
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 4de3bc5f
  Nick Thomas authored Apr 26, 2018
  
  4de3bc5f
- Merge branch 'ide-relative-url-fix' of gitlab.com:gitlab-org/gitlab-ce · c2834665
  Nick Thomas authored Apr 26, 2018
  
  c2834665
- Merge branch 'ide-temp-file-folder-fixes' into 'master' · 25c17102
  Filipa Lacerda authored Apr 26, 2018
```
Fixed bugs with IDE new directory

Closes #44838

See merge request gitlab-org/gitlab-ce!18274
```
  25c17102
- Add changelog entry · 52ed6946
  Kushal Pandya authored Apr 26, 2018
  
  52ed6946
- Add tests to assert sidebar behavior · 3bbaa9ec
  Kushal Pandya authored Apr 26, 2018
  
  3bbaa9ec
- Reveal labels dropdown when labels icon is clicked on collapsed sidebar · c9b4762e
  Kushal Pandya authored Apr 26, 2018
  
  c9b4762e
- Remove anonymous import · 61edf8d2
  Kushal Pandya authored Apr 26, 2018
  
  61edf8d2
- Export class as default · f3d8f7d9
  Kushal Pandya authored Apr 26, 2018
  
  f3d8f7d9
- Merge branch '3729-filtered-search-bar-roadmap' into 'master' · 328ed1f9
  Filipa Lacerda authored Apr 26, 2018
```
Filtered search bar support for Roadmap view

Closes #3729

See merge request gitlab-org/gitlab-ee!5417
```
  328ed1f9
- Merge branch... · 12dff60c
  Filipa Lacerda authored Apr 26, 2018
```
Merge branch '45451-user-deletion-modal-with-same-info-for-delete-user-or-delete-user-and-contributions' into 'master'

Resolve "User deletion modal with same info for delete user / delete user and contributions"

Closes #45451

See merge request gitlab-org/gitlab-ce!18463
```
  12dff60c
- Resolve "User deletion modal with same info for delete user / delete user and contributions" · 54caf961
  schwedenmut authored Apr 26, 2018
  
  54caf961
- Merge branch 'tz-upgrade-vue' into 'master' · d08f2005
  Filipa Lacerda authored Apr 26, 2018
```
Upgrading Vue libraries

See merge request gitlab-org/gitlab-ce!18577
```
  d08f2005
- Upgrading Vue libraries · abb145a5
  Tim Zallmann authored Apr 26, 2018
  
  abb145a5
- Merge branch 'performance/gb/improve-pipeline-creation-service' into 'master' · 6b2eb865
  Kamil Trzciński authored Apr 26, 2018
```
Improve pipeline creation service performance

Closes #37987

See merge request gitlab-org/gitlab-ce!18582
```
  6b2eb865
- Remove link to object state model · 46771869
  Victor Wu authored Apr 25, 2018
  
  46771869
- remove peek performance_bar · c1b416e1
  Pirate Praveen authored Apr 23, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  c1b416e1
- Merge branch 'docs-zj-api-compat-docs' into 'master' · 928e45e7
  Rémy Coutable authored Apr 26, 2018
```
Document compatibility process for the HTTP API

Closes #22693

See merge request gitlab-org/gitlab-ce!18565
```
  928e45e7
- Document compatibility process for the HTTP API · f1314c5e
  Zeger-Jan van de Weg authored Apr 24, 2018
```
GitLab lacked formal documentation around our API, how the versioning
worked and to the numbers meant.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22693
```
  f1314c5e
25 Apr, 2018 8 commits
- Merge branch 'ce-to-ee-2018-04-25' into 'master' · 4bd51416
  Stan Hu authored Apr 25, 2018
```
CE upstream - 2018-04-25 21:24 UTC

See merge request gitlab-org/gitlab-ee!5487
```
  4bd51416
- Merge branch 'load-balancing-connection-quoting' into 'master' · 83a91196
  Stan Hu authored Apr 25, 2018
```
Fix DB LB errors when escaping input

See merge request gitlab-org/gitlab-ee!5481
```
  83a91196
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-25 · 44bf0655
  GitLab Bot authored Apr 25, 2018
  
  44bf0655
- Merge branch 'ce-to-ee-2018-04-25' into 'master' · ec49bf08
  Stan Hu authored Apr 25, 2018
```
CE upstream - 2018-04-25 18:26 UTC

Closes gitlab-qa#224

See merge request gitlab-org/gitlab-ee!5485
```
  ec49bf08
- Merge branch 'remove-deprecated-gitlab-chart-docs' into 'master' · 55f07cc3
  Marcia Ramos authored Apr 25, 2018
```
Link back to root Helm chart page for deprecated GitLab chart

See merge request gitlab-org/gitlab-ce!18442
```
  55f07cc3
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-25 · eec031a1
  GitLab Bot authored Apr 25, 2018
  
  eec031a1
- Merge branch 'docs/explain-auto-devops' into 'master' · 2e0eea5c
  Marcia Ramos authored Apr 25, 2018
```
Explain Auto DevOps better

See merge request gitlab-org/gitlab-ce!18282
```
  2e0eea5c
- Merge branch 'make-ghe-url-consistent-ce-docs' into 'master' · 00de34a5
  Marcia Ramos authored Apr 25, 2018
```
Make ghe url consistent ce docs

See merge request gitlab-org/gitlab-ce!18334
```
  00de34a5