Commits · 7e88d9c7e4afec2b38b6a87b2070098ecf9f0953 · nexedi / gitlab-ce

24 May, 2018 10 commits
- Revert diff notes bundle change · 7e88d9c7
  Clement Ho authored May 24, 2018
  
  7e88d9c7
- Fix group settings layout · b7f6f96a
  Annabel Dunstone Gray authored May 24, 2018
  
  b7f6f96a
- Fix pipeline job tooltip · 7c8fda2e
  Clement Ho authored May 24, 2018
  
  7c8fda2e
- Fix collapsed sidebar tooltips · a877e1a3
  Clement Ho authored May 24, 2018
  
  a877e1a3
- Fix external user badge color · c670fcc0
  Annabel Dunstone Gray authored May 24, 2018
  
  c670fcc0
- Replace remaining .radio and .checkbox with .form-check · 53965b8f
  Clement Ho authored May 24, 2018
  
  53965b8f
- Remove unused btn-group-justified · 0a947fb2
  Clement Ho authored May 24, 2018
  
  0a947fb2
- Update class name to not use bootstrap's text-light class · e9825a60
  Annabel Dunstone Gray authored May 23, 2018
  
  e9825a60
- Fix remove group modal · 342dfe12
  Annabel Dunstone Gray authored May 23, 2018
  
  342dfe12
- Fix clone URL alignment on project page · 2ad4348e
  Annabel Dunstone Gray authored May 23, 2018
  
  2ad4348e
23 May, 2018 30 commits
- Fix help text for general settings permissions · 16c8ec60
  Clement Ho authored May 23, 2018
  
  16c8ec60
- Restore tooltip arrows · 0aed8ecb
  Clement Ho authored May 23, 2018
  
  0aed8ecb
- fix protected_branches_spec.rb · 4d4bea54
  Jose authored May 23, 2018
  
  4d4bea54
- Fix members table layout · fe34c5f6
  Annabel Dunstone Gray authored May 23, 2018
  
  fe34c5f6
- Fix bad merge conflict · 56de42b7
  Clement Ho authored May 23, 2018
  
  56de42b7
- Merge branch 'master' into bootstrap4 · 51d455d0
  Clement Ho authored May 23, 2018
  
  51d455d0
- Fix gitlab ci yml linter layout · ee16cf15
  Clement Ho authored May 23, 2018
  
  ee16cf15
- Update CHANGELOG.md for 10.8.1 · 6c51e220
  Mayra Cabrera authored May 23, 2018
```
[ci skip]
```
  6c51e220
- Add min-height to form-control · aa443c16
  Annabel Dunstone Gray authored May 23, 2018
  
  aa443c16
- Fix alignment of MR conflict resolution · 95685caf
  Annabel Dunstone Gray authored May 23, 2018
  
  95685caf
- Merge branch '39710-search-placeholder-cut-off' into 'master' · dd512684
  Annabel Gray authored May 23, 2018
```
Resolve "Runners search input placeholder is cut off"

Closes #39710

See merge request gitlab-org/gitlab-ce!19015
```
  dd512684
- Fix admin broadcast color form · 1956a8a7
  Clement Ho authored May 23, 2018
  
  1956a8a7
- Merge branch 'ldap-u2f-fix' into 'master' · 332a16b6
  Mike Greiling authored May 23, 2018
```
Fixed U2F authentication when used with LDAP

Closes #46661

See merge request gitlab-org/gitlab-ce!19115
```
  332a16b6
- Merge branch... · ddc760a0
  Douwe Maan authored May 23, 2018
```
Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-and-applicationsetting' into 'master'

Resolve "Cache JSON instead of ActiveRecord objects in `Appearance` and `ApplicationSetting`"

Closes #45175

See merge request gitlab-org/gitlab-ce!18754
```
  ddc760a0
- Merge branch 'akaemmerle-update-keyboard-shortcuts-doc' into 'master' · 610aefe4
  Achilleas Pipinellis authored May 23, 2018
```
Update keyboard shortcut conventions

See merge request gitlab-org/gitlab-ce!19014
```
  610aefe4
- Update keyboard shortcut conventions · 137c949e
  Andreas Kämmerle authored May 23, 2018
  
  137c949e
- Merge branch 'fix/devops-remove-beta' into 'master' · a2658b08
  Tim Zallmann authored May 23, 2018
```
removed "(Beta)" from "Auto DevOps" messages

See merge request gitlab-org/gitlab-ce!18759
```
  a2658b08
- Merge branch '46505-update-autodevops-docs' into 'master' · a352c0d5
  Achilleas Pipinellis authored May 23, 2018
```
Add documentation of variables usage for disabling/enabling jobs in  Auto DevOps

Closes #46505

See merge request gitlab-org/gitlab-ce!19076
```
  a352c0d5
- Add documentation of variables usage for disabling/enabling jobs in Auto DevOps · e7de169a
  Tomasz Maczukin authored May 23, 2018
  
  e7de169a
- Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master' · 63379a2a
  Rémy Coutable authored May 23, 2018
```
Resolve "Prometheus integration fails on k8s 1.10"

Closes #46259

See merge request gitlab-org/gitlab-ce!19082
```
  63379a2a
- Fixed U2F authentication when used with LDAP · 2303b083
  Phil Hughes authored May 23, 2018
```
Closes #46661
```
  2303b083
- Fix deploy keys form · 923e081b
  Clement Ho authored May 23, 2018
  
  923e081b
- Merge branch '46630-add-missing-columns-to-project-mirror-data' into 'master' · 31413f4c
  Douwe Maan authored May 23, 2018
```
Upgrading from EE to CE fails on project_mirror_data migrations

Closes #46630

See merge request gitlab-org/gitlab-ce!19109
```
  31413f4c
- Merge branch '46413-error-when-prometheus-adapter-is-disabled' into 'master' · 83796a71
  Rémy Coutable authored May 23, 2018
```
Render 404 when prometheus adapter is disabled in Prometheus metrics controller

Closes #46413

See merge request gitlab-org/gitlab-ce!19110
```
  83796a71
- Render 404 when prometheus adapter is disabled in Prometheus metrics controller · 58313de4
  Tiago Botelho authored May 23, 2018
  
  58313de4
- Rollback changes made to CreateProjectMirrorData · b92b1e8d
  Tiago Botelho authored May 23, 2018
  
  b92b1e8d
- Renames AddMissingColumnsToProjectMirrorData to EnsureMissingColumnsToProjectMirrorData · 29257b0e
  Tiago Botelho authored May 23, 2018
  
  29257b0e
- Don't expire the current ApplicationSetting in config/initializers/1_settings.rb · d7ecdceb
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  d7ecdceb
- Simplify Gitlab::CurrentSettings now that the logic is in CacheableAttributes · 2bdf6ede
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  2bdf6ede
- Use ApplicationSetting.current_without_cache instead of ApplicationSetting.current where applicable · a46929ea
  Rémy Coutable authored May 16, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a46929ea