summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow token env var from gitlab-qaqa-allow-gitlab-qa-pat-env-varMark Lapierre2018-12-272-1/+22
* Merge branch 'fj-remove-workhorse-set-content-type-feature-flag' into 'master'Douwe Maan2018-12-277-242/+46
|\
| * Removing workhorse_set_content_type feature flagFrancisco Javier López2018-12-197-242/+46
* | Merge branch 'sh-use-system-path-for-appearance-logos' into 'master'Douwe Maan2018-12-277-7/+70
|\ \
| * | Use header, favicon, and header_logo path in appearances admin formStan Hu2018-12-251-3/+3
| * | Use system paths for appearance logosStan Hu2018-12-256-4/+67
* | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-2713-4/+516
|\ \ \
| * | | Cache diff highlight in discussionsOswaldo Ferreira2018-12-2113-4/+516
* | | | Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into 'ma...Kamil Trzciński2018-12-272-2/+3
|\ \ \ \
| * | | | Handle nil terminals in Clusters::Platforms::KubernetesRémy Coutable2018-12-192-2/+3
* | | | | Merge branch '53907-improve-milestone-links' into 'master'Kamil Trzciński2018-12-274-16/+30
|\ \ \ \ \
| * | | | | Add % prefix to milestone reference link textHeinrich Lee Yu2018-12-214-16/+30
* | | | | | Merge branch 'gt-reorder-group-sidebar-menu-items' into 'master'Sean McGivern2018-12-272-13/+18
|\ \ \ \ \ \
| * | | | | | Reorder sidebar menu item for group clustersGeorge Tsiolis2018-12-222-13/+18
* | | | | | | Merge branch 'sh-bump-carrierwave-1.3.0' into 'master'Sean McGivern2018-12-273-48/+3
|\ \ \ \ \ \ \
| * | | | | | | Bump CarrierWave to 1.3.0 and remove monkey patchesStan Hu2018-12-243-48/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '54953-error-500-viewing-merge-request-due-to-nil-commit_email_h...Stan Hu2018-12-278-59/+96
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-m...Lin Jen-Shin2018-12-26591-2931/+4396
| |\ \ \ \ \ \ \
| * | | | | | | | Simplify spec/lib/gitlab/current_settings_spec.rb a bitRémy Coutable2018-12-191-3/+3
| * | | | | | | | Make sure we clear the application settings afterLin Jen-Shin2018-12-191-0/+2
| * | | | | | | | Fix cacheable_attributes_spec.rb by adding column_namesLin Jen-Shin2018-12-191-2/+6
| * | | | | | | | Use fake application settings for migration testsLin Jen-Shin2018-12-192-0/+18
| * | | | | | | | Method `create_from_defaults` will never give nilLin Jen-Shin2018-12-193-15/+9
| * | | | | | | | Move schema aware defaults to build_from_defaultsLin Jen-Shin2018-12-192-9/+7
| * | | | | | | | Return fake if and only if there's no databaseLin Jen-Shin2018-12-191-21/+10
| * | | | | | | | Return an ApplicationSetting in CurrentSettingsRémy Coutable2018-12-194-23/+55
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-clone-geo-dropdown' into 'master'docs-test-2docs-test-1Stan Hu2018-12-262-12/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Add changelog entryKushal Pandya2018-12-261-0/+5
| * | | | | | | | Fix clone dropdown parent inheritance issues in HAMLStan Hu2018-12-261-12/+12
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '55484-fix-edit-button' into 'master'Fatih Acet2018-12-262-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Add word-break to issue title to fix edit button disspearingRubén Moya2018-12-262-0/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-fix-select-activities' into 'master'Mark Lapierre2018-12-262-5/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Using find_elements instead of all_elementsat.ramya2018-12-212-5/+5
* | | | | | | | Merge branch '42125-extend-override-check-to-also-check-arity' into 'master'Lin Jen-Shin2018-12-264-35/+112
|\ \ \ \ \ \ \ \
| * | | | | | | | Extend override check to also check arity42125-extend-override-check-to-also-check-arityJacopo2018-12-224-35/+112
* | | | | | | | | Merge branch 'qa-speed-up-login-page' into 'master'Ramya Authappan2018-12-265-12/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [CE] Speed up login page usageMark Lapierre2018-12-265-12/+16
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-24-forks-seeder-cannot-find-project' into 'master'Stan Hu2018-12-261-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add new line and commentsShinya Maeda2018-12-261-0/+4
| * | | | | | | | Fix the seeder 24_forks.rb cannot find public projectShinya Maeda2018-12-261-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'milestones-community-contribution-issues' into 'master'55719-markdown-editor-s-toolbar-doesn-t-work-at-allLin Jen-Shin2018-12-241-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Milestones on community contribution issuesVictor Wu2018-12-241-0/+12
|/ / / / / / / /
* | | | | | | | Merge branch '40270-remove-gitlab-upgrader-completely' into 'master'Lin Jen-Shin2018-12-245-243/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rbJacob Wolen2018-12-245-243/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'spec-positional-arguments' into 'master'Lin Jen-Shin2018-12-246-21/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix deprecation: Using positional arguments in integration testsJasper Maes2018-12-226-21/+28
* | | | | | | | | Merge branch 'patch-35' into 'master'Marin Jankovski2018-12-241-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Alphabetized and added IBM Kubernetes service (IKS)JJ Asghar2018-12-141-1/+2
* | | | | | | | | | Merge branch 'sh-fix-http-clone-panel' into 'master'Kushal Pandya2018-12-245-26/+93
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix and move specs into admin_disables_git_access_protocol_spec.rbStan Hu2018-12-242-64/+64
View Lorry Controller Status