Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure we clear the application settings after | Lin Jen-Shin | 2018-12-19 | 1 | -0/+2 |
* | Fix cacheable_attributes_spec.rb by adding column_names | Lin Jen-Shin | 2018-12-19 | 1 | -2/+6 |
* | Use fake application settings for migration tests | Lin Jen-Shin | 2018-12-19 | 2 | -0/+18 |
* | Method `create_from_defaults` will never give nil | Lin Jen-Shin | 2018-12-19 | 3 | -15/+9 |
* | Move schema aware defaults to build_from_defaults | Lin Jen-Shin | 2018-12-19 | 2 | -9/+7 |
* | Return fake if and only if there's no database | Lin Jen-Shin | 2018-12-19 | 1 | -21/+10 |
* | Return an ApplicationSetting in CurrentSettings | Rémy Coutable | 2018-12-19 | 4 | -23/+55 |
* | Merge branch '54146-fix-calendar-query' into 'master' | Grzegorz Bizon | 2018-12-19 | 3 | -1/+15 |
|\ | |||||
| * | Fix calendar feed when sorted by priority | Heinrich Lee Yu | 2018-12-17 | 3 | -1/+15 |
* | | Merge branch 'issue-55534' into 'master' | Achilleas Pipinellis | 2018-12-19 | 1 | -1/+2 |
|\ \ | |||||
| * | | Fix typo: aunthenticator->authenticator | Erik Huelsmann | 2018-12-18 | 1 | -1/+1 |
| * | | Close #55534: link OTP auth less strictly to Google | Erik Huelsmann | 2018-12-18 | 1 | -1/+2 |
* | | | Merge branch 'use-policy-sync-for-external-dns-in-review-apps' into 'master' | Lin Jen-Shin | 2018-12-19 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Specify the 'sync' policy for the external-dns deployments | Rémy Coutable | 2018-12-18 | 1 | -1/+2 |
* | | | | Merge branch 'ce-8810-fix-weight-sort' into 'master' | Sean McGivern | 2018-12-19 | 2 | -9/+11 |
|\ \ \ \ | |||||
| * | | | | Backport of 8810-fix-weight-sort | Mario de la Ossa | 2018-12-18 | 2 | -9/+11 |
* | | | | | Merge branch 'blackst0ne-convert-specs-rails5-style' into 'master' | Jan Provaznik | 2018-12-19 | 214 | -2692/+3249 |
|\ \ \ \ \ | |||||
| * | | | | | Update specs to rails5 formatblackst0ne-convert-specs-rails5-style | blackst0ne | 2018-12-19 | 214 | -2692/+3249 |
* | | | | | | Merge branch 'docs-juangascon/gitlab-ce-doc/ci/sort-predefined-variables' int... | Evan Read | 2018-12-19 | 1 | -17/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Sort list of predefined variables in alphabetical order | Achilleas Pipinellis | 2018-12-19 | 1 | -17/+17 |
|/ / / / / / | |||||
* | | | | | | Merge branch '54781-backfill-project-repositories-for-projects-on-legacy-stor... | Stan Hu | 2018-12-19 | 10 | -208/+423 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Extract a shared example for legacy and hashed storage migrations tests | Douglas Barbosa Alexandre | 2018-12-18 | 3 | -78/+46 |
| * | | | | | | Backfill project_repositories for legacy storage projects | Douglas Barbosa Alexandre | 2018-12-18 | 9 | -176/+423 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'docs/compress-images' into 'master' | Evan Read | 2018-12-18 | 63 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Compress all images under doc/ | Achilleas Pipinellis | 2018-12-18 | 63 | -0/+0 |
* | | | | | | Merge branch 'port-missing-code-from-ee-in-group_policy' into 'master' | Douglas Barbosa Alexandre | 2018-12-18 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Add a missing policy allowance in GroupPolicy | Rémy Coutable | 2018-12-18 | 1 | -0/+1 |
* | | | | | | Merge branch 'bvl-fix-start-with-metrics-enabled' into 'master' | Sean McGivern | 2018-12-18 | 1 | -0/+0 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Load the devise initializer before metrics | Bob Van Landuyt | 2018-12-18 | 1 | -0/+0 |
* | | | | | | Merge branch 'reduce-diff-with-ee-in-protected_refs_controller' into 'master' | Douwe Maan | 2018-12-18 | 3 | -2/+10 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Reduce diff with EE in ProtectedRefsController | Rémy Coutable | 2018-12-17 | 3 | -2/+10 |
* | | | | | | Merge branch 'update/secpick' into 'master' | Robert Speicher | 2018-12-18 | 1 | -1/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update secpick script | James Lopez | 2018-12-18 | 1 | -1/+22 |
* | | | | | | | Merge branch 'osw-revert-suggestions-ff' into 'master' | Douwe Maan | 2018-12-18 | 5 | -20/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove feature flag for suggest changes feature | Oswaldo Ferreira | 2018-12-18 | 5 | -20/+4 |
* | | | | | | | | Merge branch 'force-reload-arguments-2' into 'master' | Rémy Coutable | 2018-12-18 | 3 | -7/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Passing an argument to force an association to reload is now deprecated | Jasper Maes | 2018-12-18 | 3 | -7/+8 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '53020-user-specific-profile-page-settings-fields-don-t-have-hel... | Kushal Pandya | 2018-12-18 | 8 | -31/+77 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add explanatory help text to text inputs on user profile settings page | Martin Wortschack | 2018-12-18 | 8 | -31/+77 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'fj-remove-forced-disposition-attachment-ssh-keys' into 'master' | Douwe Maan | 2018-12-18 | 2 | -7/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Remove content disposition attachment displaying all ssh keys | Francisco Javier López | 2018-12-18 | 2 | -7/+0 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'zj-upgrade-gitaly-version' into 'master' | Douwe Maan | 2018-12-18 | 3 | -25/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Upgrade Gitaly to 1.9.0 | Zeger-Jan van de Weg | 2018-12-17 | 3 | -25/+8 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch '54719-enable-hashed-storage-by-default-in-development-mode' int... | Douglas Barbosa Alexandre | 2018-12-18 | 1 | -0/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable Hashed Storage by default in development mode via seed_fu54719-enable-hashed-storage-by-default-in-development-mode | Gabriel Mazetto | 2018-12-18 | 1 | -0/+8 |
* | | | | | | | | Merge branch 'ce-6635-extract-ee-specific-files-lines-for-app-controllers-adm... | Lin Jen-Shin | 2018-12-18 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Make Admin::HealthCheckController EE-compatible | Rémy Coutable | 2018-12-17 | 1 | -1/+7 |
* | | | | | | | | Merge branch '41766-create-releases-page' into 'master' | Kamil Trzciński | 2018-12-18 | 14 | -68/+195 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Move Projects::ReleasesController under Tags | Alessio Caiazza | 2018-12-18 | 7 | -71/+147 |
| * | | | | | | | Adds releases index route | Filipa Lacerda | 2018-12-18 | 8 | -6/+57 |
| | |_|_|_|_|/ | |/| | | | | |