summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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 notifications See merge request gitlab-org/gitlab-ce!31089
| * | | | | | | | | | | | Respect alt email when sending group access notifications63568-access-email-notifications-custom-emailMario de la Ossa2019-07-257-22/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sending access granted/rejected emails we should also respect custom emails set for groups/sub-groups
* | | | | | | | | | | | | Merge branch 'tr-embed-metrics-feature-test' into 'master'Thong Kuah2019-07-262-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature test for gfm embedding metrics See merge request gitlab-org/gitlab-ce!30621
| * | | | | | | | | | | | | 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 reviews Closes #65126 See merge request gitlab-org/gitlab-ce!31158
| * | | | | | | | | | | | Add points how to prepare for database reviewsab-dbreview-prepAndreas Brandl2019-07-251-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65126. Came up in the database office hours call on 2019-07-25.
* | | | | | | | | | | | | Merge branch '20190708_CI_Docspage_Edits' into 'master'Evan Read2019-07-263-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI Docs update for Marketing See merge request gitlab-org/gitlab-ce!30440
| * | | | | | | | | | | | | Update README.md - add CTA to watch Mastering CI/CD webcast and 5 teams that ↵Agnes Oetama2019-07-263-0/+16
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | made the switch to GitLab CI/CD article
* | | | | | | | | | | | | Merge branch 'docs-support-annotation-template' into 'master'Evan Read2019-07-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for template field in prometheus alerts See merge request gitlab-org/gitlab-ce!30900
| * | | | | | | | | | | | 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 Troubleshooting section for Merge Train documentation Closes #64948 See merge request gitlab-org/gitlab-ce!31033
| * | | | | | | | | | | | Add trouble shooting for Merge TrainShinya Maeda2019-07-254-20/+85
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add trouble shooting sections
* | | | | | | | | | | | Merge branch 'docs-its-relative-9' into 'master'Evan Read2019-07-256-54/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update links to relative Closes #61945 See merge request gitlab-org/gitlab-ce!31084
| * | | | | | | | | | | | Update links to relativeMarcel Amirault2019-07-256-54/+48
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the single docs codebase change, all internal links should be relative. Also cleans up one table
* | | | | | | | | | | | Merge branch '65088-incorrect-message-interpolation-on-project-listing' into ↵Fatih Acet2019-07-253-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Incorrect message interpolation on project listing" Closes #65088 See merge request gitlab-org/gitlab-ce!31121
| * | | | | | | | | | | | Fix incorrect use of message interpolation65088-incorrect-message-interpolation-on-project-listingAlex Kalderimis2019-07-243-1/+21
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/65088
* | | | | | | | | | | | Merge branch 'print-sidekiq-class-name-in-memory-killer' into 'master'Stan Hu2019-07-252-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging sidekiq worker class name in SidekiqMemoryKiller See merge request gitlab-org/gitlab-ce!30996
| * | | | | | | | | | | Logging sidekiq worker class name in SidekiqMemoryKillerprint-sidekiq-class-name-in-memory-killerShinya Maeda2019-07-252-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, SidekiqMemoryKiller does not feed worker class name in the json structured logging. This commit extends the json parameter.
* | | | | | | | | | | | Merge branch 'outbound_local_requests_whitelist_nil' into 'master'Mayra Cabrera2019-07-253-2/+53
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix outbound_local_requests_whitelist nil for existing ApplicationSetting records Closes #65096 See merge request gitlab-org/gitlab-ce!31123
| * | | | | | | | | | | | Add default for outbound_local_requests_whitelistThong Kuah2019-07-253-2/+53
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It needs to default to an empty array logically.
* | | | | | | | | | | | Merge branch 'pl-label-incident-issues-docs' into 'master'Douglas Barbosa Alexandre2019-07-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add doc about incident issue labels See merge request gitlab-org/gitlab-ce!31107
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add namespace label toggle See merge request gitlab-org/gitlab-ce!30935
| * | | | | | | | | | | Update namespace label text for managed clustersJacques Erasmus2019-07-259-8/+137
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to update the namespace label text for gitlab-managed
* | | | | | | | | | | Merge branch 'frozen_string_spec_support' into 'master'Douwe Maan2019-07-25251-9/+508
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to spec/support See merge request gitlab-org/gitlab-ce!31132
| * | | | | | | | | | | Frozen string cannot change encodingfrozen_string_spec_supportThong Kuah2019-07-263-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was shown in specs but surely this will be happening in application code as well if this method is passes a frozen string. We were also trying to force_encode a OmniAuth::AuthHash which had the very confusing behaviour of returning nil when it was sent a method that it did not define. Fix that by only force_encoding a String.
| * | | | | | | | | | | Fix frozen string errorThong Kuah2019-07-252-5/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Add frozen_string_literal to spec/supportThong Kuah2019-07-25247-0/+494
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* | | | | | | | | | | Merge branch 'log-system-unicornstderr-typofix-docs' into 'master'Stan Hu2019-07-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove \ from unicorn\_stderr.log See merge request gitlab-org/gitlab-ce!31159
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support title and desc on merge w/ push option See merge request gitlab-org/gitlab-ce!31068
| * | | | | | | | | | Support title and desc on merge w/ push optionlabel-descr-push-optsChristian Couder2019-07-245-10/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `title` and `description` set using git push options. To create a new merge request and set its title and description: git push -u origin -o merge_request.create \ -o merge_request.title="My title" \ -o merge_request.description="My description" To update an existing merge request and set its title and description: git push -u origin -o merge_request.title="My title" \ -o merge_request.description="My description" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | | | | | | | | Merge branch '54478-table_exists-not-compatible-with-rails-5-1' into 'master'Douglas Barbosa Alexandre2019-07-257-19/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "table_exists? not compatible with Rails 5.1" Closes #54478 See merge request gitlab-org/gitlab-ce!30832
| * | | | | | | | | | | Remove unneeded monkey-patch54478-table_exists-not-compatible-with-rails-5-1Heinrich Lee Yu2019-07-257-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes all calls to data_source_exists? to table_exists? since that is the intent of these calls
* | | | | | | | | | | | Merge branch 'remove-duplicate-ado-content' into 'master'Marcia Ramos2019-07-251-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate content about auto-devops customization See merge request gitlab-org/gitlab-ce!30929
| * | | | | | | | | | | | Remove duplicate content about auto-devops customizationremove-duplicate-ado-contentKenny Johnston2019-07-191-4/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'docs-single-codebase-details' into 'master'Marcia Ramos2019-07-251-33/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update guidance for EE doc submissions See merge request gitlab-org/gitlab-ce!31042
| * | | | | | | | | | | | | Update guidance for EE doc submissionsMarcel Amirault2019-07-251-33/+10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs/add-caution-to-gitlab-university' into 'master'Marcia Ramos2019-07-251-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note GitLab University may be out of date in parts See merge request gitlab-org/gitlab-ce!31034
| * | | | | | | | | | | | | Note GitLab University may be out of date in partsEvan Read2019-07-251-0/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs/update-container-registry' into 'master'Marcia Ramos2019-07-252-35/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation for current state Closes #64710 See merge request gitlab-org/gitlab-ce!30873
| * | | | | | | | | | | | | Update documentation for current stateEvan Read2019-07-252-35/+36
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch ↵Nick Thomas2019-07-251-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'qa-stop-printing-dots-while-retrieving-pod-names-in-review-deploy' into 'master' Stop printing dots while retrieving pod in review-apps.sh See merge request gitlab-org/gitlab-ce!31062
| * | | | | | | | | | | | | Stop printing dots while retrieving pod in review-apps.shqa-stop-printing-dots-while-retrieving-pod-names-in-review-deployRémy Coutable2019-07-231-2/+0
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch 'docs/improve-commit-email-steps' into 'master'Marcia Ramos2019-07-251-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve steps for setting commit email Closes #54881 See merge request gitlab-org/gitlab-ce!30833
| * | | | | | | | | | | | | Improve steps for setting commit emailEvan Read2019-07-251-15/+16
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs/ssot-phase-two' into 'master'Marcia Ramos2019-07-2510-24/+187
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine topics for Phase 2 of SSoT audit Closes #64682 See merge request gitlab-org/gitlab-ce!30831
| * | | | | | | | | | | | | Refine topics for Phase 2 of SSoT auditEvan Read2019-07-2510-24/+187
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes admin_area and application_security topics.
* | | | | | | | | | | | | Merge branch 'docs/add-structure-to-cluster-topic' into 'master'Marcia Ramos2019-07-258-209/+225
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restructure project cluster topic See merge request gitlab-org/gitlab-ce!31081