summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix markdown to render correctlydocs/fix-shibboleth-markdownEvan Read2018-11-201-85/+85
|
* Merge branch ↵Evan Read2018-11-201-0/+5
|\ | | | | | | | | | | | | | | | | '53595-allow-requests-to-local-network-requirement-yaml-include-docs' into 'master' Update docs for include to mention 'allow requests to local network' requirement Closes #53595 See merge request gitlab-org/gitlab-ce!23055
| * Update docs for include to mention 'allow requests to local network' requirementDaniel Fernau2018-11-201-0/+5
|/
* Merge branch 'frozen-string-lib-gitlab-even-even-more' into 'master'Stan Hu2018-11-20103-3/+213
|\ | | | | | | | | Enable even more frozen string for lib/gitlab See merge request gitlab-org/gitlab-ce!23161
| * Enable even more frozen string for lib/gitlabgfyoung2018-11-16103-3/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/hook_data/**/*.rb * lib/gitlab/i18n/**/*.rb * lib/gitlab/import/**/*.rb * lib/gitlab/import_export/**/*.rb * lib/gitlab/kubernetes/**/*.rb * lib/gitlab/legacy_github_import/**/*.rb * lib/gitlab/manifest_import/**/*.rb * lib/gitlab/metrics/**/*.rb * lib/gitlab/middleware/**/*.rb Partially addresses gitlab-org/gitlab-ce#47424.
* | Merge branch 'sh-bump-gems-security' into 'master'Douglas Barbosa Alexandre2018-11-194-16/+21
|\ \ | | | | | | | | | | | | Bump nokogiri, loofah, and rack gems for security updates See merge request gitlab-org/gitlab-ce!23204
| * | Bump nokogiri, loofah, and rack gems for security updatesStan Hu2018-11-194-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loofah: CVE-2018-16468: https://github.com/flavorjones/loofah/issues/154 nokogiri: CVE-2018-14404 and CVE-2018-14567 https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md rack: CVE-2018-16471 https://github.com/rack/rack/commit/e5d58031b766e49687157b45edab1b8457d972bd i18n: https://github.com/svenfuchs/i18n/releases concurrent-ruby: https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md
* | | Merge branch 'sh-bump-ruby-parser' into 'master'Douglas Barbosa Alexandre2018-11-192-6/+6
|\ \ \ | | | | | | | | | | | | | | | | Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibility See merge request gitlab-org/gitlab-ce!23209
| * | | Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibilityStan Hu2018-11-192-6/+6
| |/ / | | | | | | | | | See https://github.com/seattlerb/ruby_parser/blob/master/History.rdoc
* | | Merge branch 'rails5-active-record-class-value' into 'master'Stan Hu2018-11-198-10/+15
|\ \ \ | | | | | | | | | | | | | | | | Rails5 deprecation: Passing a class as a value in an Active Record query is deprecated See merge request gitlab-org/gitlab-ce!23164
| * | | Rails5: Passing a class as a value in an Active Record query is deprecatedJasper Maes2018-11-178-10/+15
| | |/ | |/|
* | | Merge branch 'qa-staging-15-use-existing-users-ce' into 'master'Mark Lapierre2018-11-193-1/+28
|\ \ \ | | | | | | | | | | | | | | | | CE port of "qa-staging-15-use-existing-users-ee" See merge request gitlab-org/gitlab-ce!22864
| * | | CE port of "qa-staging-15-use-existing-users-ee"Sanad Liaquat2018-11-193-1/+28
|/ / /
* | | Merge branch 'docs-runbook-guide' into 'master'Mike Lewis2018-11-199-3/+91
|\ \ \ | |_|/ |/| | | | | | | | add guide for creating runbook See merge request gitlab-org/gitlab-ce!22885
| * | resize guide imagesdocs-runbook-guidedanielgruesso2018-11-195-0/+0
| | |
| * | Delete jupyter-start.pngDaniel Gruesso2018-11-121-0/+0
| | |
| * | Upload New FileDaniel Gruesso2018-11-121-0/+0
| | |
| * | Remove start server image, clarify instance auth, use fake token.Daniel Gruesso2018-11-122-6/+3
| | |
| * | Remove quotes and bold UI item namesMike Lewis2018-11-091-6/+7
| | |
| * | Minor editsMike Lewis2018-11-091-11/+11
| | |
| * | fix broken linkdanielgruesso2018-11-071-1/+1
| | |
| * | update broken linksdanielgruesso2018-11-071-2/+2
| | |
| * | add guide for creating runbookdanielgruesso2018-11-0710-0/+90
| | |
* | | Merge branch 'gt-fix-typo-in-notebook-props' into 'master'Fatih Acet2018-11-196-9/+14
|\ \ \ | | | | | | | | | | | | | | | | Fix typo in js (props, specs) See merge request gitlab-org/gitlab-ce!23103
| * | | Fix typos in comments for jsGeorge Tsiolis2018-11-155-9/+9
| | | |
| * | | Fix typo in notebook propsGeorge Tsiolis2018-11-152-1/+6
| | | |
* | | | Merge branch 'rs-moar-runners' into 'master'Kamil Trzciński2018-11-191-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Increase rspec parallelization to 50 See merge request gitlab-org/gitlab-ce!23149
| * | | | Increase rspec parallelization to 50rs-moar-runnersRobert Speicher2018-11-161-4/+4
| | | | |
* | | | | Merge branch 'jramsay/file-tree-docs' into 'master'Achilleas Pipinellis2018-11-192-3/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update merge request file tree docs See merge request gitlab-org/gitlab-ce!23187
| * | | | | Update merge request file tree docsJames Ramsay2018-11-192-3/+4
| | | | | |
* | | | | | Merge branch '54046-fix-by-any-email-for-private-commit-emails' into 'master'Douwe Maan2018-11-196-44/+119
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match users better by their private commit email Closes #54046 See merge request gitlab-org/gitlab-ce!23080
| * | | | | | Match users better by their private commit emailNick Thomas2018-11-196-44/+119
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private commit emails were introduced in !22560, but some parts of GitLab were not updated to take account of them. This commit adds support in places that were missed.
* | | | | | Merge branch 'if-ee-726-smartcard_auth-ce_port' into 'master'Douwe Maan2018-11-198-30/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of ee/8120: Smartcard authentication See merge request gitlab-org/gitlab-ce!23012
| * | | | | | Backport of ee/8120: Smartcard authenticationif-ee-726-smartcard_auth-ce_portImre Farkas2018-11-188-30/+72
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'leipert-forward-gitlab-svgs' into 'master'Clement Ho2018-11-192-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade @gitlab/svg to 1.38.0 See merge request gitlab-org/gitlab-ce!23177
| * | | | | | Upgrade @gitlab/svg to 1.38.0Lukas Eipert2018-11-192-5/+5
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'improve-variables-support' into 'master'Sean McGivern2018-11-1910-213/+236
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve variables support See merge request gitlab-org/gitlab-ce!23077
| * | | | | | Improve variables supportimprove-variables-supportKamil Trzciński2018-11-1910-213/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that variables accept only string, alongside also improves kubernetes_namespace, improving validation and default value being set.
* | | | | | | Merge branch '51959-branch-and-tag-name-links' into 'master'Douglas Barbosa Alexandre2018-11-193-40/+77
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for surfacing a link to the branch or tag name in push message… Closes #51959 See merge request gitlab-org/gitlab-ce!22651
| * | | | | | Add support for surfacing a link to the branch or tag name in push message…Tony Castrogiovanni2018-11-193-40/+77
|/ / / / / /
* | | | | | Merge branch 'refactor-member-add-user-for-ee' into 'master'Robert Speicher2018-11-191-5/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Member#add_user for GitLab EE See merge request gitlab-org/gitlab-ce!23119
| * | | | | | Refactor Member#add_user for GitLab EErefactor-member-add-user-for-eeYorick Peterse2018-11-151-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab EE extends Member#add_user by adding some LDAP specific flags. Prior to these changes, the only way this could be done was by modifying Member#add_user in place. This could lead to merge conflicts whenever a developer wants to change this method. To resolve this issue, the logic that EE extends has been moved into a separate method with the appropriate arguments. This allows EE to extend the logic by prepending the method using an EE specific module.
* | | | | | | Merge branch 'docs/introduced-in-fixes' into 'master'Marcia Ramos2018-11-191-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some "Introduced in" inconsistencies See merge request gitlab-org/gitlab-ce!23154
| * | | | | | | Fix some "Introduced in" inconsistenciesdocs/introduced-in-fixesAchilleas Pipinellis2018-11-161-4/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'libre-to-core' into 'master'Marcia Ramos2018-11-191-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: update Libre -> Core See merge request gitlab-org/gitlab-ce!22533
| * | | | | | | Documentation: update Libre -> CoreDavid Planella2018-11-191-3/+4
|/ / / / / / /
* | | | | | | Merge branch 'docs/clusters-knative' into 'master'Marcia Ramos2018-11-191-13/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the cluster docs for Knative See merge request gitlab-org/gitlab-ce!23113
| * | | | | | | Update the cluster docs for Knativedocs/clusters-knativeAchilleas Pipinellis2018-11-161-13/+11
| | | | | | | |
* | | | | | | | Merge branch 'revert-e20ceb56' into 'master'Sean McGivern2018-11-193-458/+168
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'docs/split-front-page' into 'master'" Closes #54211 See merge request gitlab-org/gitlab-ce!23179
| * | | | | | | | Revert "Merge branch 'docs/split-front-page' into 'master'"Achilleas Pipinellis2018-11-193-458/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21946
View Lorry Controller Status