Commits · f2cb08e16a1f6196717681d79b0013d782ca5a7d · Léo-Paul Géneau / gitlab-ce

29 May, 2018 22 commits
- Add bootstrap fixes that were in EE but were mismatching in CE · f2cb08e1
  Clement Ho authored May 29, 2018
  
  f2cb08e1
- Merge branch '46849-update-rdoc-to-6-0-4' into 'master' · 0d32ec44
  Robert Speicher authored May 29, 2018
```
Update rdoc to 6.0.4

Closes #46849

See merge request gitlab-org/gitlab-ce!19167
```
  0d32ec44
- Merge branch 'branches-fixes' into 'master' · a6b828ca
  Clement Ho authored May 29, 2018
```
Fix branches panel at smaller screen sizes

See merge request gitlab-org/gitlab-ce!19157
```
  a6b828ca
- Merge branch '46852-remove-always-on-spinner' into 'master' · 57fbd614
  Clement Ho authored May 29, 2018
```
Resolve "Merge request spinner spins forever after loading the diff"

Closes #46852

See merge request gitlab-org/gitlab-ce!19188
```
  57fbd614
- Resolve "Merge request spinner spins forever after loading the diff" · 8f1dd45a
  Lukas Eipert authored May 29, 2018
  
  8f1dd45a
- Merge branch 'patch-26' into 'master' · 4c74936f
  Achilleas Pipinellis authored May 29, 2018
```
ensure UIDs and GIDs match for HA setup

Closes omnibus-gitlab#2138

See merge request gitlab-org/gitlab-ce!19054
```
  4c74936f
- ensure UIDs and GIDs match for HA setup · 6b109357
  Ben Bodenmiller authored May 29, 2018
  
  6b109357
- Merge branch '44602-clarify-update-docs-text-about-restrictions' into 'master' · 4af756e5
  Achilleas Pipinellis authored May 29, 2018
```
Resolve "Clarify/Update docs/text about restrictions."

See merge request gitlab-org/gitlab-ce!17970
```
  4af756e5
- Merge branch '46759-ensure-operations-menu-only-visible-if-needed' into 'master' · a4c8afda
  Dmitriy Zaporozhets authored May 29, 2018
```
Resolve "Operations navigation menu renders empty menu when user does not have the right permissions"

Closes #46759

See merge request gitlab-org/gitlab-ce!19198
```
  a4c8afda
- Resolve "Operations navigation menu renders empty menu when user does not have... · 7a0f15e2
  Lukas Eipert authored May 29, 2018
```
Resolve "Operations navigation menu renders empty menu when user does not have the right permissions"
```
  7a0f15e2
- Merge branch... · 79251271
  Kamil Trzciński authored May 29, 2018
```
Merge branch '38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster' into 'master'

Resolve "Fetch available parameters directly from GKE when creating a cluster"

Closes #38759

See merge request gitlab-org/gitlab-ce!17806
```
  79251271
- Merge branch 'ensure-remote-mirror-columns-in-ce' into 'master' · 516c0076
  Douwe Maan authored May 29, 2018
```
Adds migration to ensure all remote mirror columns get created

Closes #46775

See merge request gitlab-org/gitlab-ce!19196
```
  516c0076
- Adds migration to ensure all remote mirror columns get created · 4a344a15
  Tiago Botelho authored May 29, 2018
  
  4a344a15
- Merge branch 'dz-redesign-group-settings-page' into 'master' · c5adf04c
  Filipa Lacerda authored May 29, 2018
```
Redesign group settings page into expandable sections

See merge request gitlab-org/gitlab-ce!19184
```
  c5adf04c
- Merge branch 'patch-21' into 'master' · 1c6462c3
  Rémy Coutable authored May 29, 2018
```
cleanup Prometheus setup details

Closes #37492

See merge request gitlab-org/gitlab-ce!18736
```
  1c6462c3
- cleanup Prometheus setup details · ce793617
  Ben Bodenmiller authored May 29, 2018
  
  ce793617
- Merge branch 'add-artifacts_expire_at-to-api' into 'master' · 6b7a70d2
  Grzegorz Bizon authored May 29, 2018
```
Expose artifacts_expire_at field for job entity in api

See merge request gitlab-org/gitlab-ce!18872
```
  6b7a70d2
- Merge branch 'sh-tag-queue-duration-api-calls' into 'master' · 43ec52ab
  Sean McGivern authored May 29, 2018
```
Log queue duration for Grape API calls

Closes #46601

See merge request gitlab-org/gitlab-ce!19159
```
  43ec52ab
- Merge branch 'qa/rs-api-users-spec' into 'master' · a75d1121
  Grzegorz Bizon authored May 29, 2018
```
Simplify users API QA spec

See merge request gitlab-org/gitlab-ce!19147
```
  a75d1121
- Merge branch 'groups-controller-show-performance' into 'master' · 35597a4c
  Douwe Maan authored May 29, 2018
```
Improve performance of GroupsController#show

See merge request gitlab-org/gitlab-ce!18973
```
  35597a4c
- Merge branch '38919/wiki-empty-states' into 'master' · aaa98c73
  Phil Hughes authored May 29, 2018
```
Add helpful messages to empty wiki view

Closes #38919

See merge request gitlab-org/gitlab-ce!19007
```
  aaa98c73
- Add helpful messages to empty wiki view · 67199aed
  Paul Slaughter authored May 29, 2018
  
  67199aed
28 May, 2018 18 commits
- Log queue duration for Grape API calls · 16e04e00
  Stan Hu authored May 25, 2018
```
This mimics the same thing the RailsQueueDuration does for Rails controller
requests and will help diagnose issues with API delays.

Closes #46601
```
  16e04e00
- Check the GCP cluster form for the GCP token · 8d7e0bdf
  Matija Čupić authored May 28, 2018
  
  8d7e0bdf
- Move token_in_session to helper method · 1e431464
  Matija Čupić authored May 28, 2018
  
  1e431464
- Use full path to group settings partials · 277ba7f8
  Dmitriy Zaporozhets authored May 28, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  277ba7f8
- Merge branch 'docs/fix-contributing-broken-tag' into 'master' · 6e354cb6
  Rémy Coutable authored May 28, 2018
```
"Build" team is now "Distribution"

See merge request gitlab-org/gitlab-ce!19186
```
  6e354cb6
- Merge branch 'ab-45389-remove-double-checked-internal-id-generation' into 'master' · b7467908
  Yorick Peterse authored May 28, 2018
```
Remove double-checked internal id generation.

Closes #45389

See merge request gitlab-org/gitlab-ce!19181
```
  b7467908
- Merge branch 'ce-6225-unify-app-views-milestones' into 'master' · 47cd6a06
  Rémy Coutable authored May 28, 2018
```
CE:  Resolve "Extract EE specific files/lines for app/views/shared/milestones"

See merge request gitlab-org/gitlab-ce!19185
```
  47cd6a06
- Merge branch 'add-background-migration-to-fill-file-store' into 'master' · 8adf5395
  Kamil Trzciński authored May 28, 2018
```
Add background migration to fill file stores from `NULL`  to `1`

Closes #45337 and #45476

See merge request gitlab-org/gitlab-ce!18557
```
  8adf5395
- Merge branch '38479-rename-secret-variables-to-variables' into 'master' · 98b1d76c
  Kamil Trzciński authored May 28, 2018
```
Resolve "Rename "secret variables" to "variables""

See merge request gitlab-org/gitlab-ce!19103
```
  98b1d76c
- Resolve "Rename "secret variables" to "variables"" · 7f1b7152
  Fabio Busatto authored May 28, 2018
  
  7f1b7152
- Merge branch 'patch-28' into 'master' · bb88fb7e
  Kamil Trzciński authored May 28, 2018
```
Returns a correct TMP_UPLOAD_PATH to workhourse

Closes #46763

See merge request gitlab-org/gitlab-ce!19148
```
  bb88fb7e
- Merge branch 'leipert-forward-bootstrap4' into 'master' · 57838e33
  Filipa Lacerda authored May 28, 2018
```
Update bootstrap to 4.1.1

See merge request gitlab-org/gitlab-ce!19179
```
  57838e33
- Simplify titles for group settings sections · ecbf5dee
  Dmitriy Zaporozhets authored May 28, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ecbf5dee
- Use render_if_exists for group settings page to keep same code as EE · 6d357cce
  Dmitriy Zaporozhets authored May 28, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6d357cce
- include groups in description · d6e3a6b5
  Davin Walker authored May 28, 2018
  
  d6e3a6b5
- update tests · f7efc5f8
  Dennis Tang authored May 28, 2018
  
  f7efc5f8
- overhaul dropdown-dependent states · 2e4bea09
  Dennis Tang authored May 28, 2018
  
  2e4bea09
- Fix tests after group settings page redesign · fcdf3931
  Dmitriy Zaporozhets authored May 28, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fcdf3931