summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Support selective highlighting of lines65152-unfolded-lines-perf-improvementPatrick Bajao2019-09-022-7/+19
| | | | | | | | | | Instead of highlighting all lines when not all of them are needed, only highlight from the beginning up to the specified limit. The `BlobPresenter#highlight` method has been updated to support `to` param. This param will be used to limit the content to be highlighted.
* Merge branch '46686-move-k8s-services-out-of-gcp-namespace' into 'master'66783-usage-ping-for-slack-integrationsThong Kuah2019-09-019-250/+242
|\ | | | | | | | | Move generic k8s services out of GCP namespace See merge request gitlab-org/gitlab-ce!32310
| * Move generic k8s services out of GCP namespace46686-move-k8s-services-out-of-gcp-namespaceTiger2019-08-289-250/+242
| | | | | | | | | | These services aren't specific to GCP, and will be used for AWS as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/46686
* | Merge branch ↵Nick Thomas2019-09-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | '66139-remove-kubernetes_namespace_per_environment-feature-flag' into 'master' Remove :kubernetes_namespace_per_environment feature flag See merge request gitlab-org/gitlab-ce!32140
| * | Remove :kubernetes_namespace_per_environment feature flag66139-remove-kubernetes_namespace_per_environment-feature-flagTiger2019-08-301-1/+1
| | | | | | | | | | | | Feature flag has been defaulting to `true` since 12.2
* | | Merge branch 'remove-unnecessary-freeze-in-app-models' into 'master'Stan Hu2019-09-0130-45/+45
|\ \ \ | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in app/models See merge request gitlab-org/gitlab-ce!32499
| * | | Avoid calling freeze on already frozen strings in app/modelsdineshpanda2019-09-0130-45/+45
| | | |
* | | | Merge branch 'remove-unnecessary-freeze-in-app-controllers' into 'master'Stan Hu2019-09-014-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid calling freeze on already frozen strings in app/controllers See merge request gitlab-org/gitlab-ce!32498
| * | | | Avoid calling freeze on already frozen strings in app/controllersdineshpanda2019-09-014-8/+8
| |/ / /
* | | | Merge branch 'improve-chatops-help' into 'master'Nick Thomas2019-09-011-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve chatops help output See merge request gitlab-org/gitlab-ce!32208
| * | | | Improve chatops help outputimprove-chatops-helpYorick Peterse2019-08-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the output produced when running an unknown command, running the "help" command, and when trying to run a command you are not allowed to run. The new help output includes links to the project of the chatops integration, and a link to the chatops documentation.
* | | | | Merge branch 'refactor/showStagedIcon' into 'master'Paul Slaughter2019-09-012-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Refactor showStagedIcon property's behavior to match its name Closes #66071 See merge request gitlab-org/gitlab-ce!32333
| * | | | Refactor showStagedIcon property's behavior to match its nameArun Kumar Mohan2019-08-302-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the `showStagedIcon` property was doing the opposite of what its name suggested. It was rendering the staged icon when `showStagedIcon` was `false` and rendering the regular icon when it was `true`.
* | | | | Merge branch 'remove-ignorable-column-concern' into 'master'Michael Kozono2019-08-3010-59/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependency on IgnorableColumn concern Closes #66746 See merge request gitlab-org/gitlab-ce!32427
| * | | | | Use self.ignored_columns += instead of =Stan Hu2019-08-306-25/+24
| | | | | | | | | | | | | | | | | | | | | | | | This is to accomodate prepended modules.
| * | | | | Remove dependency on IgnorableColumn concerndineshpanda2019-08-3010-58/+25
| | | | | |
* | | | | | Creates Feature Flag for job logFilipa Lacerda2019-08-303-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates frontend code and specs to allow for the new feature flag
* | | | | | Limit access request email to 10 most recently active owners/maintainersManoj MJ2019-08-303-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change limits the number of emails for new access requests notifications to 10 most recently active owners/maintainers
* | | | | | Fix for #56295, https://gitlab.com/gitlab-org/gitlab-ce/issues/56295.Jesse Hall2019-08-301-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | All avatars now visible in commit trailers.
* | | | | | Merge branch 'fix-nil-deployable-exception-on-job-controller-show' into 'master'Grzegorz Bizon2019-08-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix users cannot access job detail page when deployable does not exist Closes #65216 See merge request gitlab-org/gitlab-ce!32247
| * | | | | | Fix deployable nil exception on job controllerfix-nil-deployable-exception-on-job-controller-showShinya Maeda2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When deployable is nil, we gracefully take care of the case.
* | | | | | | Install cert-manager v0.9.1James Fargher2019-08-301-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not support upgrading from earlier versions
* | | | | | | Merge branch 'ab-routable-two-step-search' into 'master'Jan Provaznik2019-08-301-2/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform two-step Routable lookup by path See merge request gitlab-org/gitlab-ce!32272
| * | | | | | | Add another counter to calculate method call ratioab-routable-two-step-searchAndreas Brandl2019-08-301-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should see the ratio drop down when enabling the Feature. Recommendation by @andrewn
| * | | | | | | Add method call count instrumentationAndreas Brandl2019-08-301-0/+11
| | | | | | | |
| * | | | | | | Perform two-step Routable lookup by pathAndreas Brandl2019-08-301-2/+9
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to lookup a Project or Namespace by path, we prefer an exact match (case-sensitive) but in absence of that, we'd also take a case-insensitive match. The case-insensitive matching with preference for the exact match is a bit more involved in SQL as the exact lookup. Yet, the majority of cases will be an exact match. The thinking here is that we can optimize the lookup by performing an exact match first and only if there is no result, we perform the case-insensitive lookup. Data for GitLab.com: * We have about 15M records in routes table * About 2,500 routes exist where there's more than one record with the same `lower(path)` It is possible for a user to craft requests that would always trigger the 2-step search (e.g. we have a route for `/foo/bar`, the request is always for `/FOO/bar`). In this case, the change at hand is not beneficial as it would run an additional query. However, based on the data, it is highly likely that the vast majority of requests can be satisfied with an exact match only. The context for this change is https://gitlab.com/gitlab-org/gitlab-ce/issues/64590#note_208156463.
* | | | | | | Improve search result labelsMarkus Koller2019-08-302-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use "results" instead of "blobs", "wiki blobs", "snippet blobs" - Use "comments" instead of "notes" - Use correct pluralization - Don't add "1 - 10 of" if there's only one page
* | | | | | | Delete animation width on global search inputManeschi Romain2019-08-301-2/+1
| | | | | | |
* | | | | | | Revert "DB change, migratoin and changelog"Lee Tickett2019-08-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* | | | | | | Merge branch 'nfriend-add-anchor-tag-to-release-block' into 'master'Kushal Pandya2019-08-301-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `id` attribute to release blocks See merge request gitlab-org/gitlab-ce!32360
| * | | | | | | Add id to release blocknfriend-add-anchor-tag-to-release-blockNathan Friend2019-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an id attribute to release blocks to allow them to be targeted as anchor links.
* | | | | | | | Merge branch 'ce-13479-rename-atmtwps-to-mtwps' into 'master'Paul Slaughter2019-08-302-9/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!15535: Resolve "Rename `ATMTWPS` to `MTWPS` in code" See merge request gitlab-org/gitlab-ce!32112
| * | | | | | | | Rename ATMTWPS to MTWPS (CE)ce-13479-rename-atmtwps-to-mtwpsNathan Friend2019-08-222-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does a find-and-replace from ATMTWPS -> MTWPS.
* | | | | | | | | Resolve "Use "moved" instead of "closed" in issue references"Juliette de Rancourt2019-08-301-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | URL-encode file links in find fileJan Beckmann2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/62055
* | | | | | | | Allow be_url to specify the typeAlex Kalderimis2019-08-301-5/+5
| |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the be_url matcher to be more specific. By default, it only matches HTTP and HTTPS URIs.
* | | | | | | Merge branch 'ce-backport-of-ml-web-terminal-spec-qa' into 'master'Dan Davison2019-08-292-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from EE MR 8186 See merge request gitlab-org/gitlab-ce!31707
| * | | | | | | Backport changes from EEce-backport-of-ml-web-terminal-spec-qaMark Lapierre2019-08-292-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8186
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-2932-73/+341
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'security-enable-image-proxy' into 'master'GitLab Release Tools Bot2019-08-294-9/+55
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use image proxy to mitigate stealing ip addresses Closes #2812 See merge request gitlab/gitlabhq!2926
| | * | | | | | | | Add support for using a Camo proxy serverBrett Walker2019-08-234-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User images and videos will get proxied through the Camo server in order to keep malicious sites from collecting the IP address of users.
| * | | | | | | | | Merge branch 'security-2853-prevent-comments-on-private-mrs' into 'master'GitLab Release Tools Bot2019-08-292-4/+11
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure only authorised users can create notes on merge requests and issues See merge request gitlab/gitlabhq!3137
| | * | | | | | | | | Prevent unauthorised comments on merge requestsAlex Kalderimis2019-08-072-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevent creating notes on inaccessible MRs This applies the notes rules at the MR scope. Rather than adding extra rules to the Project level policy, preventing :create_note here is better since it only prevents creating notes on MRs. * Prevent creating notes in inaccessible Issues without this policy, non-team-members are allowed to comment on issues even when the project has the private-issues policy set. This means that without this change, users are allowed to comment on issues that they cannot read. * Add CHANGELOG entry
| * | | | | | | | | | Merge branch 'security-epic-notes-api-reveals-historical-info-ce-master' ↵GitLab Release Tools Bot2019-08-294-2/+8
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Filter out old system notes for epics in notes api endpoint response See merge request gitlab/gitlabhq!3224
| | * | | | | | | | | | Return NO_ACCESS if user is nilPatrick Derichs2019-08-281-0/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Filter out old system notes for epicsPatrick Derichs2019-08-283-2/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'security-personal-snippets' into 'master'GitLab Release Tools Bot2019-08-293-2/+12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add direct upload support for personal snippets See merge request gitlab/gitlabhq!3226
| | * | | | | | | | | | | Add direct upload support for personal snippetsJan Provaznik2019-08-233-2/+12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'security-fix-html-injection-for-label-description-ce-master' ↵GitLab Release Tools Bot2019-08-292-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix HTML injection for label description See merge request gitlab/gitlabhq!3250
| | * | | | | | | | | | | | Fix HTML injection for label descriptionPatrick Derichs2019-08-052-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Add spec