Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update specs to rails5 formatblackst0ne-convert-specs-rails5-style | blackst0ne | 2018-12-19 | 214 | -2692/+3249 |
* | 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 |
* | | | | | | | Merge branch 'reduce-imports_controller-diff-with-ce' into 'master' | Lin Jen-Shin | 2018-12-18 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make Projects::ImportsController EE-compatible | Rémy Coutable | 2018-12-17 | 1 | -5/+5 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch '51226-check-yarn-lock' into 'master' | Rémy Coutable | 2018-12-18 | 4 | -131/+67 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Deduplicate yarn dependencies | Lukas Eipert | 2018-12-17 | 1 | -129/+22 |
| * | | | | | | | Add danger check for duplicate yarn dependencies | Lukas Eipert | 2018-12-17 | 4 | -2/+45 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'deprecated-directly-inheriting-migration' into 'master' | Rémy Coutable | 2018-12-18 | 2 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix deprecation: Directly inheriting from ActiveRecord::Migration is deprecated. | Jasper Maes | 2018-12-17 | 2 | -1/+6 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'deprecated-alias-method-chain' into 'master' | Rémy Coutable | 2018-12-18 | 3 | -4/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend... | Jasper Maes | 2018-12-17 | 3 | -4/+11 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '51485-new-issue-labels-note' into 'master' | Rémy Coutable | 2018-12-18 | 5 | -14/+69 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Run CommonSystemNotesService on issuable create | Heinrich Lee Yu | 2018-12-18 | 5 | -14/+69 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '55036-add-manual-assets-compile-job-qa' into 'master' | Rémy Coutable | 2018-12-18 | 3 | -10/+10 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Run gitlab:assets:compile on qa jobs | Mark Lapierre | 2018-12-17 | 3 | -10/+10 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rs-except-deprecation' into 'master' | Sean McGivern | 2018-12-18 | 3 | -9/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Change deprecated `except!` usages | Robert Speicher | 2018-12-16 | 3 | -9/+12 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'suggest-diff-line-change-documentation' into 'master' | Achilleas Pipinellis | 2018-12-18 | 7 | -0/+92 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Suggest diff line change documentation | Jacques Erasmus | 2018-12-18 | 7 | -0/+92 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'blackst0ne-improve-encoding-helper-spec' into 'master' | Rémy Coutable | 2018-12-18 | 5 | -5/+10 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Update specs to exclude possible false positive pass | blackst0ne | 2018-12-18 | 5 | -5/+10 |
* | | | | | | Merge branch 'sh-carrierwave-patch-google-acl' into 'master' | Sean McGivern | 2018-12-18 | 3 | -2/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix object storage not working properly with Google S3 compatibility | Stan Hu | 2018-12-17 | 3 | -2/+21 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'bvl-hide-confidential-events-take2' into 'master' | Sean McGivern | 2018-12-18 | 9 | -112/+176 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Hide confidential events in ruby | Bob Van Landuyt | 2018-12-17 | 9 | -112/+176 |
* | | | | | | | Merge branch 'fj-fix-action-name-jobscontroller' into 'master' | Rémy Coutable | 2018-12-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ |