summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WIP: Assert we're not inside a transactionab/one-off-ci-iid-assertAndreas Brandl2019-09-061-0/+1
|
* Merge branch 'quote-branch-names-in-instructions' into 'master'Nick Thomas2019-09-063-9/+15
|\ | | | | | | | | Quote branch names in how to merge instructions See merge request gitlab-org/gitlab-ce!32639
| * Quote branch names in how to merge instructionsLee Tickett2019-09-063-9/+15
|/
* Merge branch 'docs/add_file_diff_description' into 'master'Marcia Ramos2019-09-063-0/+22
|\ | | | | | | | | | | | | Docs: explain what is a diff Closes #62072 See merge request gitlab-org/gitlab-ce!32560
| * Docs: explain what is a diffRussell Dickenson2019-09-063-0/+22
|/
* Merge branch 'sh-add-sidekiq-logging-for-bad-ci' into 'master'Grzegorz Bizon2019-09-063-1/+46
|\ | | | | | | | | Log errors for failed pipeline creation in PostReceive See merge request gitlab-org/gitlab-ce!32633
| * Log errors for failed pipeline creation in PostReceivesh-add-sidekiq-logging-for-bad-ciStan Hu2019-09-053-1/+46
| | | | | | | | | | | | | | | | | | | | When a pipeline fails to create in `PostReceive`, the error is silently discarded, making it difficult to understand why a pipeline was not created. We now add a Sidekiq warning message for this. Adding a Sentry exception when this happens would generate a lot of noise for invalid CI files. Relates to https://gitlab.com/gitlab-org/gitlab-ee/issues/14720
* | Merge branch '66596-allow-danger-to-be-run-locally-2' into 'master'Lin Jen-Shin2019-09-0615-76/+334
|\ \ | | | | | | | | | | | | Break up Danger rules into local or CI only See merge request gitlab-org/gitlab-ce!32747
| * | Add new GitlabDanger classAsh McKenzie2019-09-0615-76/+334
|/ / | | | | | | This class encapsulates our use of the Danger gem.
* | Merge branch '67032-add-projects-param-to-issuable-finder' into 'master'Kamil Trzciński2019-09-063-5/+88
|\ \ | | | | | | | | | | | | | | | | | | Add projects parameter to IssuableFinder Closes #67032 and gitlab-ee#10904 See merge request gitlab-org/gitlab-ce!32694
| * | Add projects parameter to IssuableFinderLin Jen-Shin2019-09-063-5/+88
| | |
* | | Merge branch 'instance-group-level-knative' into 'master'Grzegorz Bizon2019-09-069-230/+288
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Knative installation on group and instance level clusters Closes #62667 and #62666 See merge request gitlab-org/gitlab-ce!32128
| * | | Extract shared example from feature specsinstance-group-level-knativeAlishan Ladhani2019-09-054-670/+241
| | | | | | | | | | | | | | | | For installing applications on a project/group/instance cluster
| * | | Enable Knative installation on group and instance level clustersAlishan Ladhani2019-09-057-6/+493
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Show Knative install button on group/instance cluster pages - Allow Knative to be installed on group/instance clusters - Add feature specs for installing applications on group/instance clusters - Add changelog entry - Update docs to reflect that Knative can now be installed on group-level and instance-level clusters
* | | | Merge branch 'winh-show-weight-on-new-board-issue-ce' into 'master'Kushal Pandya2019-09-063-1/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Show weight on new board issue (CE-backport) See merge request gitlab-org/gitlab-ce!32746
| * | | | Show weight on new board issue (CE-backport)Winnie Hellmann2019-09-063-1/+33
|/ / / /
* | | | Merge branch 'renovate/gitlab-packages' into 'master'Kushal Pandya2019-09-062-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update GitLab Packages See merge request gitlab-org/gitlab-ce!32668
| * | | | Update GitLab PackagesLukas Eipert2019-09-052-11/+11
| | | | |
* | | | | Merge branch 'sh-add-margin-member-list' into 'master'Annabel Dunstone Gray2019-09-062-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add padding to left of "Sort by" in members dropdown See merge request gitlab-org/gitlab-ce!32602
| * | | | | Add padding to left of "Sort by" in members dropdownsh-add-margin-member-listStan Hu2019-09-052-1/+6
| |/ / / /
* | | | | Merge branch 'ce-detect-github-pull-requests' into 'master'Kamil Trzciński2019-09-0628-5/+869
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port CreateGithubPullRequestEvents migration from EE See merge request gitlab-org/gitlab-ce!31802
| * | | | | CE port for pipelines for external pull requestsce-detect-github-pull-requestsFabio Pitino2019-09-0528-5/+869
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect if pipeline runs for a GitHub pull request When using a mirror for CI/CD only we register a pull_request webhook. When a pull_request webhook is received, if the source branch SHA matches the actual head of the branch in the repository we create immediately a new pipeline for the external pull request. Otherwise we store the pull request info for when the push webhook is received. When using "only/except: external_pull_requests" we can detect if the pipeline has a open pull request on GitHub and create or not the job based on that.
* | | | | | Merge branch 'qa-ml-approval-rules-tests' into 'master'Ramya Authappan2019-09-067-8/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of EE MR approvals E2E test See merge request gitlab-org/gitlab-ce!32439
| * | | | | | CE backport of EE MR approvals E2E testqa-ml-approval-rules-testsMark Lapierre2019-09-047-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes API methods to add members to projects and groups
* | | | | | | Merge branch 'docs-13712-public-mr-approval-state-api-ce' into 'master'Ash McKenzie2019-09-061-0/+71
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Add info about MR approval state public API See merge request gitlab-org/gitlab-ce!32445
| * | | | | | | Doc: Fixes after doc reviewdocs-13712-public-mr-approval-state-api-cePatrick Bajao2019-09-051-3/+3
| | | | | | | |
| * | | | | | | Doc: Fix sentence explaining the responsePatrick Bajao2019-09-031-2/+2
| | | | | | | |
| * | | | | | | Doc: Add info about MR approval state public APIPatrick Bajao2019-09-031-0/+71
| | | | | | | |
* | | | | | | | Merge branch 'docs-fe-mr-review-docs' into 'master'Tim Zallmann2019-09-061-0/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a small checklist reminder about MR See merge request gitlab-org/gitlab-ce!32528
| * | | | | | | | Adds a small checklist reminder about MRFilipa Lacerda2019-09-061-0/+18
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frontend maintainers are a bit overloaded with reviews. In order to speed up the review process we are compiling on the frontend guidelines the list of steps everyone should be following before asking for review
* | | | | | | | Merge branch 'fix-style-lint-errors-pipeline-ce' into 'master'Filipa Lacerda2019-09-064-4/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Adds backport change for pipeline.scss See merge request gitlab-org/gitlab-ce!32670
| * | | | | | | Adds backport change for pipeline.scssfix-style-lint-errors-pipeline-cepburdette2019-09-044-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the necessary backport changes for pipeline.scss. This commit is neccessary from the changes made in MR 16135 Revert schema.rb which was automatically added will investigate
* | | | | | | | Merge branch ↵Marcia Ramos2019-09-062-0/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '66616-follow-up-documentation-for-merge-trains-cancel-when-running' into 'master' Follow up documentation for Merge Trains cancel when running Closes #66616 See merge request gitlab-org/gitlab-ce!32218
| * | | | | | | | Follow up documentation for Merge Trains cancel when runningSean Carroll2019-09-062-0/+19
|/ / / / / / / /
* | | | | | | | Merge branch '13353-GraphQL-DesignType-event-ce' into 'master'Jan Provaznik2019-09-061-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!15561 (Expose new GraphQL `event` field for `DesignType`) See merge request gitlab-org/gitlab-ce!32249
| * | | | | | | | CE-specific changes for GraphQL DesignType `event`13353-GraphQL-DesignType-event-ceLuke Duncalfe2019-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15561 https://gitlab.com/gitlab-org/gitlab-ee/issues/12705 https://gitlab.com/gitlab-org/gitlab-ee/issues/13353
* | | | | | | | | Merge branch 'use_default_external_auth_label_empty' into 'master'Thong Kuah2019-09-063-1/+32
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent empty external authorization classification labels from overriding default label Closes #66617 See merge request gitlab-org/gitlab-ce!32517
| * | | | | | | | | Stop empty external auth classification labels overriding default labelsWill Chandler2019-09-063-1/+32
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the project templates bundled with GitLab have an empty string set for `external_authorization_classification_label` in their `project.json`. When imported this overrides the default label set on the instance, causing the label to appear empty. This change sets empty labels to nil during import, allowing the default label to override it and be applied to the project.
* | | | | | | | | Merge branch 'revert-351d72cb' into 'master'Lin Jen-Shin2019-09-0614-280/+73
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'" See merge request gitlab-org/gitlab-ce!32741
| * | | | | | | | | Revert "Merge branch '66596-allow-danger-to-be-run-locally' into 'master'"revert-351d72cbAsh McKenzie2019-09-0614-280/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !32196
* | | | | | | | | | Merge branch 'winh-fix-flaky-dashboard_spec' into 'master'Kushal Pandya2019-09-063-194/+190
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move monitoring dashboard_spec to Jest Closes #66922 See merge request gitlab-org/gitlab-ce!32571
| * | | | | | | | | | Move monitoring dashboard_spec to JestWinnie Hellmann2019-09-063-194/+190
|/ / / / / / / / / /
* | | | | | | | | | Merge branch ↵Jan Provaznik2019-09-065-0/+79
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59729-estimate-quick-action-does-not-produce-correct-time-for-1mo' into 'master' Resolve "estimate quick action does not produce correct time for 1mo" See merge request gitlab-org/gitlab-ce!32165
| * | | | | | | | | | Fix time tracking parsing of months59729-estimate-quick-action-does-not-produce-correct-time-for-1moHeinrich Lee Yu2019-09-055-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patches ChronicDuration to use our custom conversions when parsing months
* | | | | | | | | | | Merge branch 'add-docs-for-srv-handling' into 'master'Thong Kuah2019-09-061-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port: Document SRV handling for DB load balancing See merge request gitlab-org/gitlab-ce!32539
| * | | | | | | | | | | Document DB load balancing SRV records handlingadd-docs-for-srv-handlingAhmad Sherif2019-09-051-1/+5
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'update-docs-spotbugs-java-11' into 'master'Achilleas Pipinellis2019-09-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document Spotbugs Java version See merge request gitlab-org/gitlab-ce!32627
| * | | | | | | | | | | Document Spotbugs Java versionCameron Swords2019-09-061-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-merge-examples-with-features' into 'master'Achilleas Pipinellis2019-09-063-167/+165
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge browser performance testing docs together See merge request gitlab-org/gitlab-ce!32693
| * | | | | | | | | | Merge browser performance testing docs togetherMarcel Amirault2019-09-063-167/+165
|/ / / / / / / / / /