summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Correct case of GitLab in section headerdocs-fix-case-zmZeff Morgan2019-08-151-1/+1
|
* Merge branch 'enable-specific-embeds' into 'master'Mayra Cabrera2019-08-156-23/+102
|\ | | | | | | | | Support metrics dashboard query parameters in GFM metrics filter See merge request gitlab-org/gitlab-ce!31304
| * Support query parameters in metrics embedsSarah Yasonik2019-08-156-23/+102
|/ | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/62971 Adds support for embedding specific charts from the metrics dashboard. Expected parameters are dashboard, title, group, and y_label.
* Merge branch '65927-role-span-css-looks-too-large' into 'master'Fatih Acet2019-08-151-5/+0
|\ | | | | | | | | | | | | Fix for role span being too 'ballooned' Closes #65927 See merge request gitlab-org/gitlab-ce!31706
| * Fix for role span being too 'ballooned'65927-role-span-css-looks-too-largeAsh McKenzie2019-08-121-5/+0
| |
* | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Fatih Acet2019-08-152-5/+5
|\ \ | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.68.0 See merge request gitlab-org/gitlab-ce!31729
| * | Update dependency @gitlab/svgs to ^1.68.0Lukas Eipert2019-08-132-5/+5
| | |
* | | Merge branch 'squash-project-templates-on-update' into 'master'Michael Kozono2019-08-154-14/+66
|\ \ \ | | | | | | | | | | | | | | | | Squash project templates on update See merge request gitlab-org/gitlab-ce!31592
| * | | Squash project templates on updateHordur Freyr Yngvason2019-08-154-14/+66
|/ / / | | | | | | | | | | | | | | | | | | As per https://gitlab.com/gitlab-org/gitlab-ce/issues/46043, project templates should be squashed before updating, so that repositories created from these templates don't include the full history of the backing repository.
* | | Merge branch 'sh-fix-discussions-spec' into 'master'Mayra Cabrera2019-08-151-3/+5
|\ \ \ | | | | | | | | | | | | | | | | Fix failing N+1 spec in spec/requests/api/discussions_spec.rb See merge request gitlab-org/gitlab-ce!31865
| * | | Fix failing N+1 spec in spec/requests/api/discussions_spec.rbStan Hu2019-08-151-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | This test was failing in EE because the API helper `get()` creates a personal access token each time it's run. We can avoid that by pre-creating a personal access token and passing it each time.
* | | | Merge branch 'new-cycle-analytics-backend-migrations' into 'master'Mayra Cabrera2019-08-1510-0/+149
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Migrations for Cycle Analytics backend See merge request gitlab-org/gitlab-ce!31621
| * | | | Migrations for Cycle Analytics backendAdam Hegyi2019-08-1510-0/+149
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This change lays the foundation for customizable cycle analytics stages. The main reason for the change is to extract the event definitions to separate objects (start_event, end_event) so that it could be easily customized later on.
* | | | Merge branch '65797-remove-gitaly-rebase-status-from-model' into 'master'Mayra Cabrera2019-08-154-53/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Only read rebase status from the model See merge request gitlab-org/gitlab-ce!31847
| * | | Only read rebase status from the modelNick Thomas2019-08-154-53/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to 12.1, rebase status was looked up directly from Gitaly. In https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14417 , a DB column was added to track the status instead. However, we couldn't stop looking at the gitaly status immediately, since some rebases may been running across the upgrade. Now that we're in 12.3, it is safe to remove the direct-to-gitaly lookup. This also happens to fix a 500 error that is seen when viewing an MR for a fork where the source project has been removed. We still look at the Gitaly status in the service, just in case Gitaly and Sidekiq get out of sync - I assume this is possible, and it's a relatively cheap check. Since we atomically check and set `merge_requests.rebase_jid`, we should never enqueue two `RebaseWorker` jobs in parallel.
* | | Merge branch 'mc-removes-fixtures-from-db-files' into 'master'Stan Hu2019-08-152-5/+13
|\ \ \ | | | | | | | | | | | | | | | | Removes db/fixtures from database files See merge request gitlab-org/gitlab-ce!31635
| * | | Removes db/fixtures from database filesMayra Cabrera2019-08-152-5/+13
|/ / / | | | | | | | | | | | | This will avoid Danger to suggest a database review for files inside db/fixtures
* | | Merge branch ↵Douglas Barbosa Alexandre2019-08-1526-73/+601
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '50020-allow-email-notifications-to-be-disabled-for-all-users-of-a-group' into 'master' Allow email notifications to be disabled for all users of a group See merge request gitlab-org/gitlab-ce!30755
| * | | Allow disabling group/project email notificationsBrett Walker2019-08-1526-73/+601
|/ / / | | | | | | | | | | | | | | | - Adds UI to configure in group and project settings - Removes notification configuration for users when disabled at group or project level
* | | Merge branch 'sh-update-rugged-0.28.3' into 'master'Mayra Cabrera2019-08-152-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Upgrade Rugged to 0.28.3.1 See merge request gitlab-org/gitlab-ce!31794
| * | | Upgrade Rugged to 0.28.3.1sh-update-rugged-0.28.3Stan Hu2019-08-152-1/+6
| | | | | | | | | | | | | | | | | | | | This is a security release: https://github.com/libgit2/libgit2/releases
* | | | Merge branch 'ashmckenzie/remove-duplicate-users-routes' into 'master'Stan Hu2019-08-151-7/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove duplicate -/users/terms routes See merge request gitlab-org/gitlab-ce!31812
| * | | | Remove duplicate -/users/terms routesashmckenzie/remove-duplicate-users-routesAsh McKenzie2019-08-141-7/+0
| | | | |
* | | | | Merge branch 'dblessing-fix-public-project-ssh-only-ci-failure' into 'master'Douglas Barbosa Alexandre2019-08-153-1/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow CI to clone public projects when HTTP protocol is disabled Closes #65805 See merge request gitlab-org/gitlab-ce!31632
| * | | | | 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 'sh-fix-discussions-api-perf' into 'master'Douglas Barbosa Alexandre2019-08-153-10/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate many Gitaly calls in discussions API Closes #65957 See merge request gitlab-org/gitlab-ce!31834
| * | | | | | Eliminate many Gitaly calls in discussions APIStan Hu2019-08-153-10/+74
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the API to retrieve discussions from merge requests often generated hundreds of Gitaly calls to determine whether a system note should be shown to the user. It did this by: 1. Rendering the Markdown 2. Extracting cross-references from the Markdown 3. For cross-references that were commits, a Gitaly FindCommit RPC would be issued to validate that the commit exists. The last step is unnecessary because we don't need to display a commit if the user doesn't have access to the project in the first place. `RendersNotes#prepare_notes_for_rendering` is already used in `MergeRequestsController`, which is why we don't see N+1 Gitaly calls there. We use it here to optimize the note redaction process. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65957
* | | | | | Merge branch 'fix-broken-ee-master-prepend-todos-api' into 'master'Stan Hu2019-08-151-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds EE prepend, which for some reason was missing See merge request gitlab-org/gitlab-ce!31851
| * | | | | | Adds EE prepend, which for some reason was missingfix-broken-ee-master-prepend-todos-apiAlex Kalderimis2019-08-151-0/+2
| | | | | | |
* | | | | | | Merge branch 'georgekoltsov/48854-fix-empty-flash-message' into 'master'ce-update-ff-permissions-for-new-strategiesStan Hu2019-08-153-11/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude json content type from workhorse interception See merge request gitlab-org/gitlab-ce!31809
| * | | | | | | Swap clauses as per code review suggestiongeorgekoltsov/48854-fix-empty-flash-messageGeorge Koltsov2019-08-151-1/+1
| | | | | | | |
| * | | | | | | Add changelog entryGeorge Koltsov2019-08-141-0/+6
| | | | | | | |
| * | | | | | | Exclude json content type from workhorse interceptionGeorge Koltsov2019-08-142-11/+23
| | | | | | | |
* | | | | | | | Merge branch '65278-livesum-puma-phase' into 'master'Kamil Trzciński2019-08-153-6/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove :puma_phase metrics See merge request gitlab-org/gitlab-ce!31773
| * | | | | | | | Remove :puma_phase metrics65278-livesum-puma-phaseAleksei Lipniagov2019-08-143-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't use phase restarts, as we use `preload_app`: https://github.com/puma/puma/blob/master/README.md#clustered-mode `:puma_phase` values will always be zero.
* | | | | | | | | Merge branch 'ld-remove-prepend' into 'master'Ash McKenzie2019-08-151-2/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove prepend_if_ee from CE codebase See merge request gitlab-org/gitlab-ce!31845
| * | | | | | | | | Remove prepend_if_ee from CE codebaseLuke Duncalfe2019-08-151-2/+0
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31789
* | | | | | | | | Merge branch ↵Ash McKenzie2019-08-153-10/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '13494-todo-s-not-rendering-when-there-is-a-design-management-related-todo-ce' into 'master' CE backport of gitlab-org/gitlab-ee!15129 (Allow Todos to link to Designs) See merge request gitlab-org/gitlab-ce!31789
| * | | | | | | | | CE-specific changes to allow design Todos13494-todo-s-not-rendering-when-there-is-a-design-management-related-todo-ceLuke Duncalfe2019-08-153-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE-specific changes for: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15129 Co-Authored-By: Alex Kalderimis <akalderimis@gitlab.com> Co-Authored-By: Luke Duncalfe <lduncalfe@eml.cc>
* | | | | | | | | | Merge branch 'allow-focus-in-specs' into 'master'Bob Van Landuyt2019-08-152-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to use focus: true in specs See merge request gitlab-org/gitlab-ce!31691
| * | | | | | | | | | Mention focus: true in the specsallow-focus-in-specsGiorgenes Gelatti2019-08-131-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Allow to use focus: true in specsGiorgenes Gelatti2019-08-111-0/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'ashmckenzie/docs-ce-ee-merge-at-gitlab' into 'master'Evan Read2019-08-151-0/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add section on how we run CE->EE merge at GitLab See merge request gitlab-org/gitlab-ce!31659
| * | | | | | | | | | | Add section on how we run CE->EE merge at GitLabAsh McKenzie2019-08-151-0/+13
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs-push-options-since' into 'master'Achilleas Pipinellis2019-08-151-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation: tell when push options were introduced See merge request gitlab-org/gitlab-ce!31836
| * | | | | | | | | | | Documentation: tell when push options were introducedChristian Couder2019-08-151-0/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/dependency-list-dependency-scanning' into 'master'Evan Read2019-08-157-10/+57
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update/expand docs for the Dependency List. See merge request gitlab-org/gitlab-ce!31147
| * | | | | | | | | | | Update/expand docs for the Dependency ListMark Florian2019-08-157-10/+57
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes align the docs with the features introduced in [1]. See also the [issue tracking the documentation changes][2]. [1]: https://gitlab.com/gitlab-org/gitlab-ee/issues/10077 [2]: https://gitlab.com/gitlab-org/gitlab-ee/issues/12986
* | | | | | | | | | | Merge branch 'sethgitlab-description-templates' into 'master'Achilleas Pipinellis2019-08-155-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update description templates screenshots See merge request gitlab-org/gitlab-ce!31623
| * | | | | | | | | | | Update description templates screenshotsSeth Berger2019-08-155-10/+10
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated screenshots about description templates in the project settings documentation. Closes #https://gitlab.com/gitlab-org/gitlab-ce/issues/65738