summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow CI to clone public projects when HTTP protocol is disabledDrew Blessing2019-08-143-1/+22
| | | | | | | | | | | | | | GitLab has a mechanism that allows CI to clone repositories via HTTP even when the HTTP protocol is disabled. This works as expected when a project is private or internal. However, when a project is public CI gets an error message that HTTP is not allowed. This happens because Git only sends auth in a subsequent request after a 401 is returned first. For public projects, GitLab grabs onto that unauthenticated request and sends it through since it recognizes that Guests are ordinarily allowed to access the repository. Later on this leads to a 403 since HTTP protocol is disabled. Fix this by only continuing with unauthenticated requests when HTTP is allowed.
* Merge branch 'callout-border-fix' into 'master'Clement Ho2019-08-141-1/+7
|\ | | | | | | | | | | | | Fixed border styles for callout Closes #66000 See merge request gitlab-org/gitlab-ce!31782
| * Fixed border styles for calloutAishwarya Subramanian2019-08-141-1/+7
|/
* Merge remote-tracking branch ↵John T Skarbek2019-08-145-0/+51
|\ | | | | | | 'dev/security-2873-restrict-slash-commands-to-users-who-can-log-in'
| * Restrict slash commands to users who can log inHordur Freyr Yngvason2019-07-195-0/+51
| |
* | Merge branch 'revert-ebb13148' into 'master'Mayra Cabrera2019-08-148-46/+1
|\ \ | | | | | | | | | | | | Revert "Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' into 'master'" See merge request gitlab-org/gitlab-ce!31817
| * | Revert "Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' ↵Kushal Pandya2019-08-148-46/+1
|/ / | | | | | | | | | | into 'master'" This reverts merge request !30808
* | Merge branch '12502-add-view-stats-to-cycle-analytics' into 'master'Bob Van Landuyt2019-08-147-2/+47
|\ \ | | | | | | | | | | | | Track views of cycle analytics show page See merge request gitlab-org/gitlab-ce!31717
| * | Track page views for cycle analytics show pageAdam Hegyi2019-08-147-2/+47
|/ / | | | | | | | | This change adds a new counter 'cycle_analytics_views' to the usage data metrics to count the page views for cycle analytics show page.
* | Merge branch '59829-fix-style-lint-wiki' into 'master'Filipa Lacerda2019-08-149-24/+12
|\ \ | | | | | | | | | | | | | | | | | | Fix the style-lint errors and warnings for wiki.scss Closes #59829 See merge request gitlab-org/gitlab-ce!31656
| * | Fix style-lint errors in wiki.scssHimanshu Kapoor2019-08-149-24/+12
|/ / | | | | | | | | | | | | | | | | There were two errors: duplicate styles and @extend used with a class name. I added `.top-area` class to all the instances where `.wiki-page-header` is used since %top-area didn't really make a lot of sense as a placeholder selector. This is also consistent with behaviour on other pages where the `.top-area` class is used alongside the other classes for the specific header styling.
* | Merge branch 'limit-amount-of-needs' into 'master'Grzegorz Bizon2019-08-142-4/+52
|\ \ | | | | | | | | | | | | Add `ci_dag_limit_needs` See merge request gitlab-org/gitlab-ce!31803
| * | Add `ci_dag_limit_needs` feature flaglimit-amount-of-needsKamil Trzciński2019-08-142-4/+52
| | | | | | | | | | | | | | | This makes to limit `needs:` to 5 by default. Allow to increase the limit to 50 with disable of FF.
* | | Merge branch 'docs-update-guest-user-doc' into 'master'Tom Atkins2019-08-141-0/+10
|\ \ \ | | | | | | | | | | | | | | | | Docs add guest user clarification See merge request gitlab-org/gitlab-ce!31805
| * | | Fixing phrasing for guest userdocs-update-guest-user-docmac-key2019-08-141-6/+6
| | | |
| * | | Add guest user clarificationmac-key2019-08-141-0/+10
| |/ /
* | | Merge branch 'sh-optimize-commit-deltas-post-receive' into 'master'Nick Thomas2019-08-1411-18/+205
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reduce Gitaly calls in PostReceive Closes #65878 See merge request gitlab-org/gitlab-ce!31741
| * | | Reduce Gitaly calls in PostReceivesh-optimize-commit-deltas-post-receiveStan Hu2019-08-1211-18/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit reduces I/O load and memory utilization during PostReceive for the common case when no project hooks or services are set up. We saw a Gitaly N+1 issue in `CommitDelta` when many tags or branches are pushed. We can reduce this overhead in the common case because we observe that most new projects do not have any Web hooks or services, especially when they are first created. Previously, `BaseHooksService` unconditionally iterated through the last 20 commits of each ref to build the `push_data` structure. The `push_data` structured was used in numerous places: 1. Building the push payload in `EventCreateService` 2. Creating a CI pipeline 3. Executing project Web or system hooks 4. Executing project services 5. As the return value of `BaseHooksService#execute` 6. `BranchHooksService#invalidated_file_types` We only need to generate the full `push_data` for items 3, 4, and 6. Item 1: `EventCreateService` only needs the last commit and doesn't actually need the commit deltas. Item 2: In addition, `Ci::CreatePipelineService` only needed a subset of the parameters. Item 5: The return value of `BaseHooksService#execute` also wasn't being used anywhere. Item 6: This is only used when pushing to the default branch, so if many tags are pushed we can save significant I/O here. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65878 Fic
* | | | Merge branch '328-versioned-search-ee' into 'master'Nick Thomas2019-08-142-39/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Elasticsearch versioned schema for Snippet See merge request gitlab-org/gitlab-ce!31465
| * | | | ES: sync with EE328-versioned-search-eeMark Chao2019-08-122-39/+65
| | | | |
* | | | | Merge branch 'optimise-dag-processing' into 'master'Grzegorz Bizon2019-08-143-16/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Optimise dag processing See merge request gitlab-org/gitlab-ce!31768
| * | | | | Optimise DAG processingoptimise-dag-processingKamil Trzciński2019-08-143-16/+37
| | | | | |
* | | | | | Merge branch 'qa-reduce-ce-ee-diff-in-qa-folder' into 'master'Walmyr2019-08-1412-45/+112
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the CE/EE diff under `qa/` See merge request gitlab-org/gitlab-ce!31799
| * | | | | | Reduce the CE/EE diff under qa/qa-reduce-ce-ee-diff-in-qa-folderRémy Coutable2019-08-1412-45/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' into 'master'Kushal Pandya2019-08-148-1/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notification for updated privacy policy Closes #64341 See merge request gitlab-org/gitlab-ce!30808
| * | | | | | | Add notification for updated privacy policyDennis Tang2019-08-148-1/+46
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a notification to let users know of our updated privacy policy. Users can dismiss the notification either by following the link or closing the notification via an "x" icon.
* | | | | | | Merge branch 'add-registry-ssl-offloading-docs' into 'master'Tom Atkins2019-08-141-0/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add troubleshooting docs for Registry image push problems See merge request gitlab-org/gitlab-ce!31807
| * | | | | | | Added troubleshooting docs for registry image push problemsCatalin Irimie2019-08-141-0/+34
|/ / / / / / /
* | | | | | | Merge branch 'ce-nfriend-fix-the-merge-button' into 'master'Filipa Lacerda2019-08-143-16/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!14894: Fix the merge button dropdown See merge request gitlab-org/gitlab-ce!31248
| * | | | | | Fix merge button dropdown (CE)ce-nfriend-fix-the-merge-buttonNathan Friend2019-08-123-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes an issue that was causing the merge button dropdown trigger to be shown even if the dropdown itself was hidden. This commit also fixes an issue that caused the "Merge Immediately" option not to be available when merge trains were enabled.
* | | | | | | Merge branch 'require-needs-to-be-present' into 'master'Grzegorz Bizon2019-08-147-23/+74
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require `needs:` to be present Closes #65839 See merge request gitlab-org/gitlab-ce!31761
| * | | | | | Require `needs:` to be presentrequire-needs-to-be-presentKamil Trzciński2019-08-137-23/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the `needs:` logic to require that all jobs to be present. Instead of skipping do fail the pipeline creation if `needs:` dependency is not found.
* | | | | | | Merge branch '10-adjust-copy-for-adding-additional-members' into 'master'Tim Zallmann2019-08-143-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust copy for adding additional members See merge request gitlab-org/gitlab-ce!31726
| * | | | | | | Add changelog entry10-adjust-copy-for-adding-additional-membersAlex Buijs2019-08-121-0/+5
| | | | | | | |
| * | | | | | | Change invite textAlex Buijs2019-08-122-4/+4
| | | | | | | |
* | | | | | | | Merge branch 'fix-spelling-in-ci-runners-readme' into 'master'Achilleas Pipinellis2019-08-141-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling of "timeouted" to "timed out" See merge request gitlab-org/gitlab-ce!31774
| * | | | | | | | Change spelling of "timeouted" to "timed out"fix-spelling-in-ci-runners-readmeVitali Tatarintev2019-08-131-3/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'doc-fix-push-options-capabilities' into 'master'Achilleas Pipinellis2019-08-141-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: fix push options capabilities See merge request gitlab-org/gitlab-ce!31792
| * | | | | | | | | Documentation: fix push options capabilitiesChristian Couder2019-08-141-0/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31068 forgot to add a short description of the new push options that it added.
* | | | | | | | | Merge branch 'tr-embed-metrics-frontend-docs' into 'master'Achilleas Pipinellis2019-08-144-0/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Embed metrics charts in issues - docs See merge request gitlab-org/gitlab-ce!30849
| * | | | | | | | | Embed metrics charts in issues - docsTristan Read2019-08-144-0/+30
|/ / / / / / / / /
* | | | | | | | | Merge branch 'install-doc-remove-quote' into 'master'Achilleas Pipinellis2019-08-141-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: remove extra quote from doc/install/installation.md See merge request gitlab-org/gitlab-ce!31785
| * | | | | | | | | Remove extra quoteAlexander Oleynikov2019-08-131-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'ce-10586-add-flag-to-object-storage-migration' into 'master'Michael Kozono2019-08-133-20/+77
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Migration Backport: Add flag to object storage See merge request gitlab-org/gitlab-ce!31695
| * | | | | | | | | | Fix Geo Node API documentationce-10586-add-flag-to-object-storage-migrationGabriel Mazetto2019-08-131-20/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Included missing fields, removed non existinting ones, improved examples
| * | | | | | | | | | Add object storage flag to Geo Node (migration)Gabriel Mazetto2019-08-132-0/+22
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '66008-fix-project-image-in-slack-notifications' into 'master'Robert Speicher2019-08-133-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project avatar image in Slack pipeline notifications Closes #66008 See merge request gitlab-org/gitlab-ce!31788
| * | | | | | | | | | | Fix project image in Slack pipeline notifications66008-fix-project-image-in-slack-notificationsNathan Friend2019-08-133-4/+9
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the project avatar images that are rendered in the footer of Slack pipeline notifications. Previously, the image URLs provided to Slack were relative URLs; now they are absolute.
* | | | | | | | | | | Merge branch 'id-source-code-smau' into 'master'Stan Hu2019-08-137-15/+51
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add usage pings for source code pushes See merge request gitlab-org/gitlab-ce!31734
| * | | | | | | | | | | Add usage pings for source code pushesIgor2019-08-137-15/+51
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Source Code Usage Ping for Create SMAU