summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Replace peek-pg with our own implementationremove-peek-pgSean McGivern2019-07-2613-127/+82
* Merge branch 'dm-submodule-links-nil' into 'master'Nick Thomas2019-07-265-3/+75
|\
| * Fix error rendering submodules in MR diffs when there is no .gitmodulesdm-submodule-links-nilDouwe Maan2019-07-265-3/+75
* | Merge branch 'pl-flat_map-ce' into 'master'Lin Jen-Shin2019-07-269-16/+14
|\ \
| * | Prefer `flat_map` over `map` + `flatten`Peter Leitzen2019-07-269-16/+14
|/ /
* | Merge branch 'docs-label-filtering' into 'master'Sean McGivern2019-07-262-0/+170
|\ \
| * | Add development documentation on label filteringdocs-label-filteringSean McGivern2019-07-252-0/+170
* | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Fatih Acet2019-07-2612-20/+22
|\ \ \
| * | | Karma: Fix css selector for loading iconLukas 'Eipi' Eipert2019-07-2612-20/+22
|/ / /
* | | Merge branch 'extract_auto_deploy_into_base_image' into 'master'Dmitriy Zaporozhets2019-07-263-376/+53
|\ \ \
| * | | Extract deploy functions in a base imageextract_auto_deploy_into_base_imageThong Kuah2019-07-253-376/+53
* | | | Merge branch 'delete-designs-v2' into 'master'Andreas Brandl2019-07-263-0/+33
|\ \ \ \
| * | | | Adds event enum column to DesignsVersions join tabledelete-designs-v2Alex Kalderimis2019-07-243-0/+33
* | | | | Merge branch 'mh/editor-indents' into 'master'Kushal Pandya2019-07-2616-39/+1287
|\ \ \ \ \
| * | | | | Add UndoStack class - a custom undo/redo engineMartin Hanzel2019-07-2616-39/+1287
|/ / / / /
* | | | | Merge branch 'if-64257-warden_set_user_fix' into 'master'James Lopez2019-07-267-15/+53
|\ \ \ \ \
| * | | | | Ensure Warden triggers after_authentication callbackImre Farkas2019-07-267-15/+53
|/ / / / /
* | | | | Merge branch 'qa-sl-nightly-117-stablize-editing-scope-label-spec-ce' into 'm...Ramya Authappan2019-07-261-1/+4
|\ \ \ \ \
| * | | | | Retry if dropdown is not visibleqa-sl-nightly-117-stablize-editing-scope-label-spec-ceSanad Liaquat2019-07-251-1/+4
* | | | | | Merge branch '63568-access-email-notifications-custom-email' into 'master'Lin Jen-Shin2019-07-267-22/+45
|\ \ \ \ \ \
| * | | | | | Respect alt email when sending group access notifications63568-access-email-notifications-custom-emailMario de la Ossa2019-07-257-22/+45
* | | | | | | Merge branch 'tr-embed-metrics-feature-test' into 'master'Thong Kuah2019-07-262-0/+68
|\ \ \ \ \ \ \
| * | | | | | | Feature test for gfm embedding metricsTristan Read2019-07-262-0/+68
|/ / / / / / /
* | | | | | | Merge branch 'ab-dbreview-prep' into 'master'Evan Read2019-07-261-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Add points how to prepare for database reviewsab-dbreview-prepAndreas Brandl2019-07-251-0/+11
* | | | | | | | Merge branch '20190708_CI_Docspage_Edits' into 'master'Evan Read2019-07-263-0/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Update README.md - add CTA to watch Mastering CI/CD webcast and 5 teams that ...Agnes Oetama2019-07-263-0/+16
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-support-annotation-template' into 'master'Evan Read2019-07-261-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add docs for template field in prometheus alertsSarah Yasonik2019-07-261-1/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-troubleshooting-for-merge-train' into 'master'Evan Read2019-07-254-20/+85
|\ \ \ \ \ \ \ \
| * | | | | | | | Add trouble shooting for Merge TrainShinya Maeda2019-07-254-20/+85
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-its-relative-9' into 'master'Evan Read2019-07-256-54/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Update links to relativeMarcel Amirault2019-07-256-54/+48
|/ / / / / / / /
* | | | | | | | Merge branch '65088-incorrect-message-interpolation-on-project-listing' into ...Fatih Acet2019-07-253-1/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix incorrect use of message interpolation65088-incorrect-message-interpolation-on-project-listingAlex Kalderimis2019-07-243-1/+21
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'print-sidekiq-class-name-in-memory-killer' into 'master'Stan Hu2019-07-252-7/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Logging sidekiq worker class name in SidekiqMemoryKillerprint-sidekiq-class-name-in-memory-killerShinya Maeda2019-07-252-7/+19
* | | | | | | | Merge branch 'outbound_local_requests_whitelist_nil' into 'master'Mayra Cabrera2019-07-253-2/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | Add default for outbound_local_requests_whitelistThong Kuah2019-07-253-2/+53
|/ / / / / / / /
* | | | | | | | Merge branch 'pl-label-incident-issues-docs' into 'master'Douglas Barbosa Alexandre2019-07-251-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add doc about incident issue labelsPeter Leitzen2019-07-251-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'je-separate-namespace-fe' into 'master'Mike Greiling2019-07-259-8/+137
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Update namespace label text for managed clustersJacques Erasmus2019-07-259-8/+137
|/ / / / / / /
* | | | | | | Merge branch 'frozen_string_spec_support' into 'master'Douwe Maan2019-07-25251-9/+508
|\ \ \ \ \ \ \
| * | | | | | | Frozen string cannot change encodingfrozen_string_spec_supportThong Kuah2019-07-263-4/+8
| * | | | | | | Fix frozen string errorThong Kuah2019-07-252-5/+6
| * | | | | | | Add frozen_string_literal to spec/supportThong Kuah2019-07-25247-0/+494
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'log-system-unicornstderr-typofix-docs' into 'master'Stan Hu2019-07-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove \ from unicorn\_stderr.logGreg Myers2019-07-251-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'label-descr-push-opts' into 'master'Lin Jen-Shin2019-07-255-10/+194
|\ \ \ \ \ \ \