Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Refactor BroadcastMessage to use Gitlab::JsonCache | Douglas Barbosa Alexandre | 2018-12-19 | 2 | -50/+10 | |
| * | | | | | | | | | | | | | | | | | | | | | Port Gitlab::JsonCache to CE | Douglas Barbosa Alexandre | 2018-12-19 | 2 | -0/+488 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ce-reduce-deploy_keys_controller-diff-with-ce' into 'master' | Robert Speicher | 2018-12-19 | 3 | -3/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Make Projects::DeployKeysController EE-ready | Rémy Coutable | 2018-12-19 | 3 | -3/+37 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ce-reduce-diff-with-ce-in-lfs_request' into 'master' | Douglas Barbosa Alexandre | 2018-12-19 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Make LfsRequest EE-compatible | Rémy Coutable | 2018-12-19 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'depracated-migration-inheritance' into 'master' | Robert Speicher | 2018-12-19 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | ActiveRecord::Migration -> ActiveRecord::Migration[5.0] | Jasper Maes | 2018-12-18 | 2 | -1/+6 | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'gt-update-danger-for-documentation' into 'master' | Rémy Coutable | 2018-12-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Update danger for documentation [ci skip] | George Tsiolis | 2018-12-19 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | Merge branch 'zj-pool-destruction' into 'master' | Kamil Trzciński | 2018-12-19 | 12 | -8/+101 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Leave object pools when destroying projects | Zeger-Jan van de Weg | 2018-12-19 | 13 | -9/+102 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'osw-adjust-flaky-rails-logger-call' into 'master' | Rémy Coutable | 2018-12-19 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Adjust flaky Rails logger call test | Oswaldo Ferreira | 2018-12-18 | 2 | -2/+7 | |
* | | | | | | | | | | | | | | | | | | | | 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 | |
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |