summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | Refactor BroadcastMessage to use Gitlab::JsonCacheDouglas Barbosa Alexandre2018-12-192-50/+10
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Port Gitlab::JsonCache to CEDouglas Barbosa Alexandre2018-12-192-0/+488
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ce-reduce-deploy_keys_controller-diff-with-ce' into 'master'Robert Speicher2018-12-193-3/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Projects::DeployKeysController EE-ready See merge request gitlab-org/gitlab-ce!23911
| * | | | | | | | | | | | | | | | | | | | Make Projects::DeployKeysController EE-readyRémy Coutable2018-12-193-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ce-reduce-diff-with-ce-in-lfs_request' into 'master'Douglas Barbosa Alexandre2018-12-191-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make LfsRequest EE-compatible See merge request gitlab-org/gitlab-ce!23903
| * | | | | | | | | | | | | | | | | | | | Make LfsRequest EE-compatibleRémy Coutable2018-12-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | Merge branch 'depracated-migration-inheritance' into 'master'Robert Speicher2018-12-192-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Migration -> ActiveRecord::Migration[5.0] for ImportCommonMetricsNginxVts See merge request gitlab-org/gitlab-ce!23910
| * | | | | | | | | | | | | | | | | | | | ActiveRecord::Migration -> ActiveRecord::Migration[5.0]Jasper Maes2018-12-182-1/+6
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'gt-update-danger-for-documentation' into 'master'Rémy Coutable2018-12-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update danger for documentation See merge request gitlab-org/gitlab-ce!23929
| * | | | | | | | | | | | | | | | | | | | Update danger for documentation [ci skip]George Tsiolis2018-12-191-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename ~Packaging label to ~Package
* | | | | | | | | | | | | | | | | | | | Merge branch 'zj-pool-destruction' into 'master'Kamil Trzciński2018-12-1912-8/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave object pools when destroying projects Closes gitaly#1415 See merge request gitlab-org/gitlab-ce!23869
| * | | | | | | | | | | | | | | | | | | Leave object pools when destroying projectsZeger-Jan van de Weg2018-12-1913-9/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This action doesn't lean on reduplication, so a short call can me made to the Gitaly server to have the object pool remove its remote to the project pending deletion. https://gitlab.com/gitlab-org/gitaly/blob/f6cd55357/internal/git/objectpool/link.go#L58 When an object pool doesn't have members, this would invalidate the need for a pool. So when a project leaves the pool, the pool will be destroyed on the background. Fixes: https://gitlab.com/gitlab-org/gitaly/issues/1415
* | | | | | | | | | | | | | | | | | | | Merge branch 'osw-adjust-flaky-rails-logger-call' into 'master'Rémy Coutable2018-12-192-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust flaky Rails logger call test See merge request gitlab-org/gitlab-ce!23916
| * | | | | | | | | | | | | | | | | | | Adjust flaky Rails logger call testOswaldo Ferreira2018-12-182-2/+7
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch '54146-fix-calendar-query' into 'master'Grzegorz Bizon2018-12-193-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix calendar feed when sorted by priority Closes #54146 See merge request gitlab-org/gitlab-ce!23870
| * | | | | | | | | | | | | | | | | | | Fix calendar feed when sorted by priorityHeinrich Lee Yu2018-12-173-1/+15
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'issue-55534' into 'master'Achilleas Pipinellis2018-12-191-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close #55534: link OTP auth less strictly to Google Closes #55534 See merge request gitlab-org/gitlab-ce!23921
| * | | | | | | | | | | | | | | | | | | Fix typo: aunthenticator->authenticatorErik Huelsmann2018-12-181-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Close #55534: link OTP auth less strictly to GoogleErik Huelsmann2018-12-181-1/+2
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'use-policy-sync-for-external-dns-in-review-apps' into 'master'Lin Jen-Shin2018-12-191-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify the 'sync' policy for the external-dns deployments See merge request gitlab-org/gitlab-ce!23912
| * | | | | | | | | | | | | | | | | | | | Specify the 'sync' policy for the external-dns deploymentsRémy Coutable2018-12-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | | Merge branch 'ce-8810-fix-weight-sort' into 'master'Sean McGivern2018-12-192-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of 8810-fix-weight-sort See merge request gitlab-org/gitlab-ce!23786
| * | | | | | | | | | | | | | | | | | | | Backport of 8810-fix-weight-sortMario de la Ossa2018-12-182-9/+11
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'blackst0ne-convert-specs-rails5-style' into 'master'Jan Provaznik2018-12-19214-2692/+3249
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5.1] Update functional specs to use new keyword format Closes #54062 See merge request gitlab-org/gitlab-ce!23095
| * | | | | | | | | | | | | | | | | | | | Update specs to rails5 formatblackst0ne-convert-specs-rails5-styleblackst0ne2018-12-19214-2692/+3249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates specs to use new rails5 format. The old format: `get :show, { some: params }, { some: headers }` The new format: `get :show, params: { some: params }, headers: { some: headers }`
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs-juangascon/gitlab-ce-doc/ci/sort-predefined-variables' ↵Evan Read2018-12-191-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sort list of predefined variables in alphabetical order See merge request gitlab-org/gitlab-ce!23834
| * | | | | | | | | | | | | | | | | | | | | Sort list of predefined variables in alphabetical orderAchilleas Pipinellis2018-12-191-17/+17
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch ↵Stan Hu2018-12-1910-208/+423
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54781-backfill-project-repositories-for-projects-on-legacy-storage' into 'master' Backfill project_repositories for legacy storage projects See merge request gitlab-org/gitlab-ce!23920
| * | | | | | | | | | | | | | | | | | | | | Extract a shared example for legacy and hashed storage migrations testsDouglas Barbosa Alexandre2018-12-183-78/+46
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Backfill project_repositories for legacy storage projectsDouglas Barbosa Alexandre2018-12-189-176/+423
| |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a background migration that will ensure all projects that are on legacy storage have a row in `project_repositories`.
* | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/compress-images' into 'master'Evan Read2018-12-1863-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compress images See merge request gitlab-org/gitlab-ce!23902
| * | | | | | | | | | | | | | | | | | | | Compress all images under doc/Achilleas Pipinellis2018-12-1863-0/+0
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'port-missing-code-from-ee-in-group_policy' into 'master'Douglas Barbosa Alexandre2018-12-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing policy allowance in GroupPolicy See merge request gitlab-org/gitlab-ce!23906
| * | | | | | | | | | | | | | | | | | | | Add a missing policy allowance in GroupPolicyRémy Coutable2018-12-181-0/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | | Merge branch 'bvl-fix-start-with-metrics-enabled' into 'master'Sean McGivern2018-12-181-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load the devise initializer before metrics Closes #55513 See merge request gitlab-org/gitlab-ce!23907
| * | | | | | | | | | | | | | | | | | | Load the devise initializer before metricsBob Van Landuyt2018-12-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Metrics tries to initialize the `EventsFinder` to instrumnt it. The `EventsFinder` tries to load the `Event` model, which in turn loads the `User` model. Loading the `User` model requires Devise to be initialized. So to avoid problems around this, we load devise before loading metrics.
* | | | | | | | | | | | | | | | | | | | Merge branch 'reduce-diff-with-ee-in-protected_refs_controller' into 'master'Douwe Maan2018-12-183-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce diff with EE in ProtectedRefsController See merge request gitlab-org/gitlab-ce!23885
| * | | | | | | | | | | | | | | | | | | Reduce diff with EE in ProtectedRefsControllerRémy Coutable2018-12-173-2/+10
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | Merge branch 'update/secpick' into 'master'Robert Speicher2018-12-181-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update/secpick See merge request gitlab-org/gitlab-ce!23900
| * | | | | | | | | | | | | | | | | | Update secpick scriptJames Lopez2018-12-181-1/+22
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'osw-revert-suggestions-ff' into 'master'Douwe Maan2018-12-185-20/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove feature flag for suggest changes feature See merge request gitlab-org/gitlab-ce!23892
| * | | | | | | | | | | | | | | | | | | Remove feature flag for suggest changes featureOswaldo Ferreira2018-12-185-20/+4
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'force-reload-arguments-2' into 'master'Rémy Coutable2018-12-183-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing an argument to force an association to reload is now deprecated See merge request gitlab-org/gitlab-ce!23894
| * | | | | | | | | | | | | | | | | | | Passing an argument to force an association to reload is now deprecatedJasper Maes2018-12-183-7/+8
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch ↵Kushal Pandya2018-12-188-31/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53020-user-specific-profile-page-settings-fields-don-t-have-help-text-placeholders' into 'master' Add explanatory help text to text inputs on user profile settings page Closes #53020 See merge request gitlab-org/gitlab-ce!23673
| * | | | | | | | | | | | | | | | | | Add explanatory help text to text inputs on user profile settings pageMartin Wortschack2018-12-188-31/+77
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'fj-remove-forced-disposition-attachment-ssh-keys' into 'master'Douwe Maan2018-12-182-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove content disposition attachment displaying all ssh keys See merge request gitlab-org/gitlab-ce!23882
| * | | | | | | | | | | | | | | | | Remove content disposition attachment displaying all ssh keysFrancisco Javier López2018-12-182-7/+0
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'zj-upgrade-gitaly-version' into 'master'Douwe Maan2018-12-183-25/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to 1.9.0 See merge request gitlab-org/gitlab-ce!23865
| * | | | | | | | | | | | | | | | | Upgrade Gitaly to 1.9.0Zeger-Jan van de Weg2018-12-173-25/+8
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This upgrade moves logic from gitlab-rails to Gitaly, which allowed code removal too.