summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update doc/user/project/import/github.mddocs-import-clarificationsMatt Penna2019-09-061-2/+3
|
* Merge branch 'docs-update-mr-documentation-template' into 'master'Achilleas Pipinellis2019-09-061-0/+1
|\ | | | | | | | | Add note about permissions in Doc MR template See merge request gitlab-org/gitlab-ce!32755
| * Add note about permissions in Doc MR templateTetiana Chupryna2019-09-061-0/+1
|/
* Merge branch 'docs-typo' into 'master'Achilleas Pipinellis2019-09-061-1/+1
|\ | | | | | | | | Docs: Fix typo in "Description templates" See merge request gitlab-org/gitlab-ce!32757
| * Fix typoStefan Schmalzhaf2019-09-061-1/+1
| |
* | Merge branch 'qa/e2e-tests-for-multiple-boards-on-group-level' into 'master'Walmyr Lima e Silva Filho2019-09-062-3/+4
|\ \ | | | | | | | | | | | | Update view for testability See merge request gitlab-org/gitlab-ce!32644
| * | Update views for testabilityqa/e2e-tests-for-multiple-boards-on-group-levelWalmyr Lima2019-09-052-3/+4
| | |
* | | Merge branch 'marketo_lead_trials' into 'master'Robert Speicher2019-09-061-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Back porting changes to trigger user create event on Trial sign up See merge request gitlab-org/gitlab-ce!32676
| * | | Back porting changes to trigger user create event on Trial sign upAishwarya Subramanian2019-09-061-0/+1
|/ / /
* | | Merge branch 'only-show-copy_metadata-when-usable' into 'master'Douglas Barbosa Alexandre2019-09-063-1/+19
|\ \ \ | | | | | | | | | | | | | | | | Only show `/copy_metadata` when usable See merge request gitlab-org/gitlab-ce!31735
| * | | Only show `/copy_metadata` when usableLee Tickett2019-09-063-1/+19
|/ / /
* | | Merge branch 'ac-accelerate-wiki-attachments' into 'master'Nick Thomas2019-09-067-10/+137
|\ \ \ | | | | | | | | | | | | | | | | accelerate wiki attachments See merge request gitlab-org/gitlab-ce!32663
| * | | Test blob_controller POST createac-accelerate-wiki-attachmentsAlessio Caiazza2019-09-061-0/+38
| | | |
| * | | Process workhorse accelerated wiki uploadsAlessio Caiazza2019-09-066-10/+99
| | | | | | | | | | | | | | | | | | | | Wiki attachments can be workhorse accelerated. This commit is backward compatible with older workhorse
* | | | Merge branch 'id-autosave-for-new-mr' into 'master'Stan Hu2019-09-065-6/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix sharing notes data in localStorage with all MRs See merge request gitlab-org/gitlab-ce!32699
| * | | | Fix sharing localStorage with all MRsIgor2019-09-065-6/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | Expose id field in the serializer in order to store comments content in the localStorage under the correct key
* | | | Merge branch 'docs-improve-label-push-opts' into 'master'Achilleas Pipinellis2019-09-061-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Documentation: tell when push option was introduced See merge request gitlab-org/gitlab-ce!32752
| * | | | Documentation: tell when push option was introducedChristian Couder2019-09-061-0/+2
|/ / / /
* | | | Merge branch 'fix-captcha-spec-state' into 'master'Lin Jen-Shin2019-09-061-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix global state in registrations_controller_spec See merge request gitlab-org/gitlab-ce!32712
| * | | | Fix global state in registrations_controller_specfix-captcha-spec-stateYorick Peterse2019-09-051-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This spec would mess with global state used for captchas, but not reset the state in all cases. This would then lead to the spec spec/controllers/snippets_controller_spec.rb failing, but only on a fork of gitlab-ee. To fix this we ensure the state is properly reset after running the specs that change this state.
* | | | | Merge branch 'revert-93f16f3d' into 'master'Lin Jen-Shin2019-09-063-190/+194
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'winh-fix-flaky-dashboard_spec' into 'master'" Closes gitlab-ee#14795 See merge request gitlab-org/gitlab-ce!32753
| * | | | Revert "Merge branch 'winh-fix-flaky-dashboard_spec' into 'master'"Winnie Hellmann2019-09-063-190/+194
|/ / / / | | | | | | | | | | | | This reverts merge request !32571
* | | | 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