summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dont-fail-danger-with-emojis' into 'master'62884-the-next-kn-service-deployed-don-t-get-fetched-due-to-reactivecachingRobert Speicher2019-06-061-2/+2
|\ | | | | | | | | Don't fail the pipeline when a colon-emoji is used See merge request gitlab-org/gitlab-ce!29291
| * Don't fail the pipeline when a colon-emoji is usedSean McGivern2019-06-061-2/+2
| | | | | | | | | | | | A colon-emoji like :100: can be valid in the case where we're talking about the GitLab feature that processes these into emojis. It's fine to warn about those, but failing the pipeline is too restrictive.
* | Merge branch 'pages-domains-validity-time-mysql' into 'master'Nick Thomas2019-06-068-2/+163
|\ \ | | | | | | | | | | | | Add certificate valid time to pages domain table See merge request gitlab-org/gitlab-ce!29287
| * | Add certificate valid time to pages domain tableVladimir Shushlin2019-06-068-2/+163
|/ / | | | | | | | | Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration
* | Merge branch 'pages_lets_encrypt_orders' into 'master'Nick Thomas2019-06-0618-35/+552
|\ \ | | | | | | | | | | | | Add pages domains acme orders See merge request gitlab-org/gitlab-ce!27811
| * | Add pages domains acme ordersVladimir Shushlin2019-06-0618-35/+552
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract acme double to helper Create ACME challanges for pages domains * Create order & challange through API * save them to database * request challenge validation We're saving order and challenge as one entity, that wouldn't be correct if we would order certificates for several domains simultaneously, but we always order certificate per domain Add controller for processing acme challenges redirected from pages Don't save acme challenge url - we don't use it Validate acme challenge attributes Encrypt private_key in acme orders
* | Merge branch 'docs-qa-dynamic-element-validation' into 'master'Dan Davison2019-06-062-3/+149
|\ \ | | | | | | | | | | | | Documentation for dynamic element validation See merge request gitlab-org/gitlab-ce!29169
| * | Documentation for dynamic element validationdocs-qa-dynamic-element-validationddavison2019-06-052-3/+149
| | | | | | | | | | | | | | | | | | First iteration on the documentation for how dynamic element validation works within the GitLab QA framework and how to utilize it
* | | Merge branch 'master' into 'master'Stan Hu2019-06-063-4/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix some typos See merge request gitlab-org/gitlab-ce!29286
| * | | Fix some typosWilliam Desportes2019-06-063-4/+4
| | |/ | |/| | | | | | | Signed-off-by: William Desportes <williamdes@wdes.fr>
* | | Merge branch 'update-gitlab-shell-9-3-0' into 'master'Douglas Barbosa Alexandre2019-06-062-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Update to GitLab Shell v9.3.0 See merge request gitlab-org/gitlab-ce!29283
| * | | Update to GitLab Shell v9.3.0Nick Thomas2019-06-062-1/+6
| |/ /
* | | Merge branch 'create-base-class-for-auto-merge-architecture' into 'master'Robert Speicher2019-06-065-60/+201
|\ \ \ | | | | | | | | | | | | | | | | Create BaseService for Auto Merge architecture See merge request gitlab-org/gitlab-ce!29120
| * | | Create BaseService for Auto Merge architecturecreate-base-class-for-auto-merge-architectureShinya Maeda2019-06-065-60/+201
| | | | | | | | | | | | | | | | It abstracts some codes for common methods in AutoMerge::*Services.
* | | | Merge branch 'winh-increase-jest-timeout-ci' into 'master'Phil Hughes2019-06-062-3/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Increase Jest timeout on CI to 5 seconds Closes #62855, #61905, and #61235 See merge request gitlab-org/gitlab-ce!29278
| * | | Increase Jest timeout on CI to 5 secondsWinnie Hellmann2019-06-062-3/+15
|/ / /
* | | Merge branch '58882-update-rspec-retry' into 'master'Stan Hu2019-06-062-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update rspec-retry to fix Selenium NoSuchDriverError errors Closes #58882 See merge request gitlab-org/gitlab-ce!29276
| * | | Update rspec-retry to fix Selenium NoSuchDriverError errorsRémy Coutable2019-06-062-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '62124-new-threaded-discussion-design' into 'master'Fatih Acet2019-06-0623-51/+208
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "New threaded discussion design" Closes #62124 See merge request gitlab-org/gitlab-ce!28580
| * | | | Format vue files with prettierMarcel van Remmerden2019-06-0623-51/+208
|/ / / / | | | | | | | | | | | | Add changelog file
* | | | Merge branch ↵Dmitriy Zaporozhets2019-06-063-16/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62847-url-for-the-next-request-with-pagination-is-missing-port' into 'master' Resolve "Url for the next request with pagination is missing port" Closes #62847 See merge request gitlab-org/gitlab-ce!29267
| * | | | Include the port in the URLs of the API Link headersRémy Coutable2019-06-063-16/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'js-i18n-datetime' into 'master'Filipa Lacerda2019-06-062-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | i18n datetime_utility file See merge request gitlab-org/gitlab-ce!29193
| * | | | | I18N datetime utility filejs-i18n-datetimeBrandon Labuschagne2019-06-052-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | Merge branch '62015-add-counterpart-tae-to-the-reviewer-roulette' into 'master'Sean McGivern2019-06-0615-21/+89
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add counterpart TAE to the reviewer roulette" Closes #62015 See merge request gitlab-org/gitlab-ce!28678
| * | | | | | Show Test Automation Engineer for spec/feature asLin Jen-Shin2019-06-0615-21/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reviewers.
* | | | | | | Merge branch '55125-mr-tab-scrolling' into 'master'Phil Hughes2019-06-0617-85/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of MR tabs and buttons Closes #55125 See merge request gitlab-org/gitlab-ce!29088
| * | | | | | | Merge request tabs fixesAnnabel Dunstone Gray2019-06-0617-85/+131
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Makes activity dropdown and resolved counter smaller - Uses grid for spacing - Removes scrolling on MR tabs
* | | | | | | Merge branch 'fix/allow-lower-case-issue-ids' into 'master'Sean McGivern2019-06-064-5/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow lowercase prefix for Youtrack issue ids Closes #62661 See merge request gitlab-org/gitlab-ce!29057
| * | | | | | | Add changelogMatthias Baur2019-06-051-0/+5
| | | | | | | |
| * | | | | | | Apply suggestion to doc/user/project/integrations/youtrack.mdMatthias Baur2019-06-051-2/+2
| | | | | | | |
| * | | | | | | Allow lowercase prefix for Youtrack issue idsMatthias Baur2019-06-033-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to #42595. Fixes #62661.
* | | | | | | | Merge branch 'docs/ssot_group_clusters2' into 'master'Marcia Ramos2019-06-061-1/+13
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Added troubleshooting section to "Group-level Kubernetes clusters" See merge request gitlab-org/gitlab-ce!29228
| * | | | | | | Added troubleshooting section to "Group-level Kubernetes clusters"Russell Dickenson2019-06-061-1/+13
|/ / / / / / /
* | | | | | | Merge branch 'dismissal-reason-docs-update' into 'master'Achilleas Pipinellis2019-06-063-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds documentation for vulnerability dismissal reasons See merge request gitlab-org/gitlab-ce!29213
| * | | | | | | Adds documentation for vulnerability dismissal reasonsSam Beckham2019-06-063-0/+10
|/ / / / / / /
* | | | | | | Merge branch '60852-update-or-upgrade' into 'master'Phil Hughes2019-06-0611-142/+139
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "update" instead of "upgrade" in Clusters -> Managed Apps Closes #60852 See merge request gitlab-org/gitlab-ce!29207
| * | | | | | | Replace upgrade with updateEnrique Alcántara2019-06-0611-142/+139
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use update term instead of update in the clusters managed app implementation in order to make the implementation and UI language more consistent.
* | | | | | | Merge branch 'jv-catfile-limit-test-only' into 'master'Stan Hu2019-06-061-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only use Gitaly catfile_cache_size=5 in test See merge request gitlab-org/gitlab-ce!29264
| * | | | | | | Only use Gitaly catfile_cache_size=5 in testJacob Vosmaer2019-06-061-1/+7
|/ / / / / / /
* | | | | | | Merge branch 'revert-a05f86ce' into 'master'Nick Thomas2019-06-068-155/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'" Closes #62861 See merge request gitlab-org/gitlab-ce!29273
| * | | | | | | Revert "Merge branch 'pages-domain_ssl-valid-period' into 'master'"revert-a05f86ceNick Thomas2019-06-068-155/+2
|/ / / / / / / | | | | | | | | | | | | | | This reverts merge request !28743
* | | | | | | Merge branch 'sh-fix-issue-55869' into 'master'Stan Hu2019-06-065-76/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of resend button in members page Closes #55869 See merge request gitlab-org/gitlab-ce!28202
| * | | | | | | Fix alignment of resend button in members pageStan Hu2019-06-065-76/+45
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55869
* | | | | | | Merge branch 'pages-domain_ssl-valid-period' into 'master'Nick Thomas2019-06-068-2/+155
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add certificate valid time to pages domain table See merge request gitlab-org/gitlab-ce!28743
| * | | | | | | Add certificate valid time to pages domain tableVladimir Shushlin2019-06-068-2/+155
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration
* | | | | | | Merge branch ↵Nick Thomas2019-06-061-112/+26
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-11314-elasticsearch-rake-tasks-should-respect-new-elasticsearch-limited-namespaces-projects-functionality' into 'master' Update docs for Elasticsearch indexing tasks See merge request gitlab-org/gitlab-ce!29132
| * | | | | | Update docs for Elasticsearch indexing tasksce-11314-elasticsearch-rake-tasks-should-respect-new-elasticsearch-limited-namespaces-projects-functionalityMarkus Koller2019-06-061-112/+26
| | | | | | |
* | | | | | | Merge branch 'ce-update-es-indexer' into 'master'Rémy Coutable2019-06-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "Update the elasticsearch indexer" See merge request gitlab-org/gitlab-ce!29237
| * | | | | | | Update the elasticsearch indexerNick Thomas2019-06-061-1/+1
| | |_|_|_|_|/ | |/| | | | |