summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fj-remove-workhorse-set-content-type-feature-flag' into 'master'Douwe Maan2018-12-272-33/+2
|\
| * Removing workhorse_set_content_type feature flagFrancisco Javier López2018-12-192-33/+2
* | Merge branch 'sh-use-system-path-for-appearance-logos' into 'master'Douwe Maan2018-12-274-6/+34
|\ \
| * | Use header, favicon, and header_logo path in appearances admin formStan Hu2018-12-251-3/+3
| * | Use system paths for appearance logosStan Hu2018-12-253-3/+31
* | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-275-1/+66
|\ \ \
| * | | Cache diff highlight in discussionsOswaldo Ferreira2018-12-215-1/+66
* | | | Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into 'ma...Kamil Trzciński2018-12-271-1/+1
|\ \ \ \
| * | | | Handle nil terminals in Clusters::Platforms::KubernetesRémy Coutable2018-12-191-1/+1
* | | | | Merge branch '53907-improve-milestone-links' into 'master'Kamil Trzciński2018-12-271-1/+1
|\ \ \ \ \
| * | | | | Add % prefix to milestone reference link textHeinrich Lee Yu2018-12-211-1/+1
* | | | | | Merge branch 'gt-reorder-group-sidebar-menu-items' into 'master'Sean McGivern2018-12-271-13/+13
|\ \ \ \ \ \
| * | | | | | Reorder sidebar menu item for group clustersGeorge Tsiolis2018-12-221-13/+13
* | | | | | | Merge branch '54953-error-500-viewing-merge-request-due-to-nil-commit_email_h...Stan Hu2018-12-272-3/+8
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-m...Lin Jen-Shin2018-12-26126-576/+1017
| |\ \ \ \ \ \ \
| * | | | | | | | Method `create_from_defaults` will never give nilLin Jen-Shin2018-12-191-1/+1
| * | | | | | | | Move schema aware defaults to build_from_defaultsLin Jen-Shin2018-12-191-1/+6
| * | | | | | | | Return an ApplicationSetting in CurrentSettingsRémy Coutable2018-12-191-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-clone-geo-dropdown' into 'master'docs-test-2docs-test-1Stan Hu2018-12-261-12/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix clone dropdown parent inheritance issues in HAMLStan Hu2018-12-261-12/+12
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Add word-break to issue title to fix edit button disspearingRubén Moya2018-12-261-0/+4
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch '42125-extend-override-check-to-also-check-arity' into 'master'Lin Jen-Shin2018-12-261-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Extend override check to also check arity42125-extend-override-check-to-also-check-arityJacopo2018-12-221-1/+0
* | | | | | | | [CE] Speed up login page usageMark Lapierre2018-12-261-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Fix HTTP/SSH clone panel for mobileStan Hu2018-12-231-4/+6
* | | | | | | Fix missing Git clone button when protocol restriction setting enabledStan Hu2018-12-232-18/+27
|/ / / / / /
* | | | | | Merge branch '55621-gitlab-ci-yml' into 'master'Achilleas Pipinellis2018-12-221-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typos around .gitlab-ci.ymlTakuya Noguchi2018-12-211-1/+1
* | | | | | | Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master'Mike Greiling2018-12-2129-253/+371
|\ \ \ \ \ \ \
| * | | | | | | Code style changes and refactorHeinrich Lee Yu2018-12-2022-228/+220
| * | | | | | | Add schema testsHeinrich Lee Yu2018-12-191-1/+1
| * | | | | | | Pass in just assignees instead of issuableHeinrich Lee Yu2018-12-195-7/+16
| * | | | | | | Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-1921-195/+337
| * | | | | | | Refactor issuable sidebar to have extras optionHeinrich Lee Yu2018-12-1911-59/+34
* | | | | | | | Merge branch 'revert-62d250ff' into 'master'Sean McGivern2018-12-213-40/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "Merge branch 'winh-discussion-header-commented' into 'master'"Winnie Hellmann2018-12-213-40/+8
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Update storage location after a group has been renamed/transferedDouglas Barbosa Alexandre2018-12-211-0/+1
* | | | | | | | Update storage location after a project has been transferedDouglas Barbosa Alexandre2018-12-211-3/+4
* | | | | | | | Update storage location after a project has been renamedDouglas Barbosa Alexandre2018-12-211-0/+1
* | | | | | | | Track storage location for legacy storage projectsDouglas Barbosa Alexandre2018-12-211-4/+2
|/ / / / / / /
* | | | | | | Rename `ClusterPlatformConfigureWorker`George Tsiolis2018-12-215-5/+5
* | | | | | | Merge branch 'markdown-toolbar-btn-fix' into 'master'Filipa Lacerda2018-12-211-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixes the markdown toolbar buttonsPhil Hughes2018-12-211-2/+2
* | | | | | | | Merge branch 'feature/option-to-make-variables-protected' into 'master'Grzegorz Bizon2018-12-2111-20/+52
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 'feature/option-to-make-variables-protected'Grzegorz Bizon2018-12-20622-3421/+8998
| |\ \ \ \ \ \ \ \
| * | | | | | | | | callout when ci variables are protected by defaultAlexis Reigel2018-12-041-0/+5
| * | | | | | | | | extract protected variable logic to helperAlexis Reigel2018-12-042-2/+17
| * | | | | | | | | extract common env. variable template to partialAlexis Reigel2018-12-043-14/+13
| * | | | | | | | | change copy to "Environment variables"Alexis Reigel2018-11-292-2/+2
| * | | | | | | | | option to make variables protected by defaultAlexis Reigel2018-11-295-5/+18