summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update specs to rails5 formatblackst0ne-convert-specs-rails5-styleblackst0ne2018-12-19214-2692/+3249
* 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 GroupPolicyRémy Coutable2018-12-181-0/+1
* | Merge branch 'bvl-fix-start-with-metrics-enabled' into 'master'Sean McGivern2018-12-181-0/+0
|\ \
| * | Load the devise initializer before metricsBob Van Landuyt2018-12-181-0/+0
* | | Merge branch 'reduce-diff-with-ee-in-protected_refs_controller' into 'master'Douwe Maan2018-12-183-2/+10
|\ \ \
| * | | Reduce diff with EE in ProtectedRefsControllerRémy Coutable2018-12-173-2/+10
* | | | Merge branch 'update/secpick' into 'master'Robert Speicher2018-12-181-1/+22
|\ \ \ \
| * | | | 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 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 deprecatedJasper Maes2018-12-183-7/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '53020-user-specific-profile-page-settings-fields-don-t-have-hel...Kushal Pandya2018-12-188-31/+77
|\ \ \ \ \ \
| * | | | | | 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 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.0Zeger-Jan van de Weg2018-12-173-25/+8
* | | | | | Merge branch '54719-enable-hashed-storage-by-default-in-development-mode' int...Douglas Barbosa Alexandre2018-12-181-0/+8
|\ \ \ \ \ \
| * | | | | | Enable Hashed Storage by default in development mode via seed_fu54719-enable-hashed-storage-by-default-in-development-modeGabriel Mazetto2018-12-181-0/+8
* | | | | | | Merge branch 'ce-6635-extract-ee-specific-files-lines-for-app-controllers-adm...Lin Jen-Shin2018-12-181-1/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Make Admin::HealthCheckController EE-compatibleRémy Coutable2018-12-171-1/+7
* | | | | | | Merge branch '41766-create-releases-page' into 'master'Kamil Trzciński2018-12-1814-68/+195
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Move Projects::ReleasesController under TagsAlessio Caiazza2018-12-187-71/+147
| * | | | | | Adds releases index routeFilipa Lacerda2018-12-188-6/+57
* | | | | | | Merge branch 'reduce-imports_controller-diff-with-ce' into 'master'Lin Jen-Shin2018-12-181-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Make Projects::ImportsController EE-compatibleRémy Coutable2018-12-171-5/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '51226-check-yarn-lock' into 'master'Rémy Coutable2018-12-184-131/+67
|\ \ \ \ \ \ \
| * | | | | | | Deduplicate yarn dependenciesLukas Eipert2018-12-171-129/+22
| * | | | | | | Add danger check for duplicate yarn dependenciesLukas Eipert2018-12-174-2/+45
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'deprecated-directly-inheriting-migration' into 'master'Rémy Coutable2018-12-182-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix deprecation: Directly inheriting from ActiveRecord::Migration is deprecated.Jasper Maes2018-12-172-1/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'deprecated-alias-method-chain' into 'master'Rémy Coutable2018-12-183-4/+11
|\ \ \ \ \ \ \
| * | | | | | | Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend...Jasper Maes2018-12-173-4/+11
| |/ / / / / /
* | | | | | | Merge branch '51485-new-issue-labels-note' into 'master'Rémy Coutable2018-12-185-14/+69
|\ \ \ \ \ \ \
| * | | | | | | Run CommonSystemNotesService on issuable createHeinrich Lee Yu2018-12-185-14/+69
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '55036-add-manual-assets-compile-job-qa' into 'master'Rémy Coutable2018-12-183-10/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Run gitlab:assets:compile on qa jobsMark Lapierre2018-12-173-10/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs-except-deprecation' into 'master'Sean McGivern2018-12-183-9/+12
|\ \ \ \ \ \
| * | | | | | Change deprecated `except!` usagesRobert Speicher2018-12-163-9/+12
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'suggest-diff-line-change-documentation' into 'master'Achilleas Pipinellis2018-12-187-0/+92
|\ \ \ \ \ \
| * | | | | | Suggest diff line change documentationJacques Erasmus2018-12-187-0/+92
|/ / / / / /
* | | | | | Merge branch 'blackst0ne-improve-encoding-helper-spec' into 'master'Rémy Coutable2018-12-185-5/+10
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update specs to exclude possible false positive passblackst0ne2018-12-185-5/+10
* | | | | | Merge branch 'sh-carrierwave-patch-google-acl' into 'master'Sean McGivern2018-12-183-2/+21
|\ \ \ \ \ \
| * | | | | | Fix object storage not working properly with Google S3 compatibilityStan Hu2018-12-173-2/+21
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bvl-hide-confidential-events-take2' into 'master'Sean McGivern2018-12-189-112/+176
|\ \ \ \ \ \
| * | | | | | Hide confidential events in rubyBob Van Landuyt2018-12-179-112/+176
* | | | | | | Merge branch 'fj-fix-action-name-jobscontroller' into 'master'Rémy Coutable2018-12-181-1/+1
|\ \ \ \ \ \ \