diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-11 17:09:11 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-11 17:09:11 +0100 |
| commit | 7f5703484b957718d4f9f576cf8ac22acc45c8de (patch) | |
| tree | 387db45c36add940497578f8bf8643088a1070c0 /Gemfile.lock | |
| parent | a9a1512448ed91e92450495c86c2d7c19b67b70d (diff) | |
| parent | 87eb2b6e510af44ec905c183d9b886a46d223815 (diff) | |
| download | gitlab-ce-7f5703484b957718d4f9f576cf8ac22acc45c8de.tar.gz | |
Merge branch 'master' into fl-eslint-vue-house-keeping
* master:
Don't use Rails.root.join for upload fixture paths
Fix translation placeholder for Gitaly address
Revert extra CSS causing Gitaly Servers table to be misalgined
Fix conversion of integer into string in board spec
Diffstat (limited to 'Gemfile.lock')
0 files changed, 0 insertions, 0 deletions