summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-1829-66/+65
|
* Merge branch '44981-http-io-trace-with-multi-byte-char' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-181-6/+16
|\ | | | | | | | | | | | | Fix `Trace::HttpIO` can not render multi-byte chars Closes #44981 See merge request gitlab-org/gitlab-ce!18417
| * Make HTTPIO compatible with multi-byte chars (Extracted from ChunkedIO)Shinya Maeda2018-04-171-6/+16
| |
* | Merge branch 'zj-uri-type-empty' into 'master'Douwe Maan2018-04-181-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Return nil on empty path Closes gitaly#1115 See merge request gitlab-org/gitlab-ce!18430
| * | Return nil on empty pathZeger-Jan van de Weg2018-04-171-0/+2
| |/ | | | | | | | | | | | | The execution path wasn't clear from the error, but either way this is a fix. Closes gitlab-org/gitaly#1115
* | [Rails5] Remove `as` keyword from `Gitlab:Ci:Trace:Stream.delegate :valid?`blackst0ne2018-04-181-1/+3
| |
* | Merge branch 'zj-ref-exists-opt-out' into 'master'Nick Thomas2018-04-171-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Move Gitaly RefExists check to OPT_OUT Closes gitaly#401 See merge request gitlab-org/gitlab-ce!18333
| * | Move Gitaly RefExists check to OPT_OUTZeger-Jan van de Weg2018-04-121-1/+2
| | | | | | | | | | | | | | | | | | Part of the Gitaly migration as tracked in: https://gitlab.com/gitlab-org/gitaly/issues/401 Acceptance testing was done in: https://gitlab.com/gitlab-org/gitaly/issues/1014
* | | Merge branch 'bvl-ignore-gitlab-pot-in-ee-compat-check' into 'master'Rémy Coutable2018-04-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Ignore `locale/gitlab.pot` in ee_compat_check See merge request gitlab-org/gitlab-ce!18424
| * | | Ignore `locale/gitlab.pot` in ee_compat_checkBob Van Landuyt2018-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | Conflicts can be resolved by running `bundle exec rake gettext:find; git checkout locale/*/gitlab.po`
* | | | Merge branch 'add-dev-check-back-for-deprecations' into 'master'Rémy Coutable2018-04-171-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add .org? method to Gitlab helper See merge request gitlab-org/gitlab-ce!18429
| * | | | Add .org? method to Gitlab helperOswaldo Ferreira2018-04-171-1/+5
| | |_|/ | |/| | | | | | | | | | dev_env_or_com? now considers dev.gitlab.org
* | | | Merge branch ↵Nick Thomas2018-04-171-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45363-optional-params-on-api-endpoint-produce-invalid-pagination-header-links' into 'master' Fix URLs in the `Link` header for `GET /projects/:id/repository/contributors` when no value is passed for `order_by` or `sort` Closes #45363 See merge request gitlab-org/gitlab-ce!18393
| * | | | [API] Fix URLs in the 'Link' header for 'GET ↵Rémy Coutable2018-04-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /projects/:id/repository/contributors' when no value is passed for 'order_by' or 'sort' Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch ↵Sean McGivern2018-04-172-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45436-markdown-is-not-rendering-error-loading-viewer-undefined-method-html_escape' into 'master' Resolve "Markdown is not rendering, "Error loading viewer": undefined method `html_escape'" Closes #45436 See merge request gitlab-org/gitlab-ce!18418
| * | | | | make call to 'html_escape' unambiguousBrett Walker2018-04-172-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'sh-memoize-repository-empty' into 'master'Grzegorz Bizon2018-04-171-6/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Memoize Git::Repository#has_visible_content? See merge request gitlab-org/gitlab-ce!18383
| * | | | | Move uncached_has_local_branches? to a private methodStan Hu2018-04-141-10/+10
| | | | | |
| * | | | | Fix failing ./spec/lib/backup/repository_spec.rb by clearing the memoized valueStan Hu2018-04-141-0/+4
| | | | | |
| * | | | | Memoize Git::Repository#has_visible_content?Stan Hu2018-04-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is called repeatedly when viewing a merge request, and this should improve performance significantly by avoiding shelling out to git every time. This should help https://gitlab.com/gitlab-com/infrastructure/issues/4027.
* | | | | | Merge branch ↵Phil Hughes2018-04-171-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45406-error-getting-performance-bar-results-for-uuid-regularly-seen-in-production' into 'master' Resolve ""Error getting performance bar results for [UUID]" regularly seen in production" Closes #45406 See merge request gitlab-org/gitlab-ce!18419
| * | | | | Fix flash errors in performance bar for cached responsesSean McGivern2018-04-171-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a request contains an ETag value in its If-None-Match header, the backend may send a request ID (from Rack) that does not correspond to a value in Peek's Redis cache (because we aborted the Rails processing in our ETag middleware). Because a cached response (304) has to replace the headers with those from the previous 200 - https://tools.ietf.org/html/rfc7234#section-4.3.4 - we add a custom header that will only be present in cache hits, that can tell the frontend to ignore these.
* | | | | Method to track recoverable exceptions in sentryBob Van Landuyt2018-04-172-4/+24
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a method to track errors that can be recovered from in sentry. It is useful when debugging performance issues, or exceptions that are hard to reproduce.
* | | | Merge branch 'ab-45247-project-lookups-validation' into 'master'Yorick Peterse2018-04-161-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Validate project path prior to hitting the database. Closes #45247 See merge request gitlab-org/gitlab-ce!18322
| * | | Validate project path prior to hitting the database.Andreas Brandl2018-04-131-2/+2
| | | | | | | | | | | | | | | | Closes #45247.
* | | | Merge branch 'osw-backport-gl-subdomain-method' into 'master'Rémy Coutable2018-04-161-10/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport GitLab domain helper methods See merge request gitlab-org/gitlab-ce!18376
| * | | | Backport GitLab domain helper methodsOswaldo Ferreira2018-04-131-10/+7
| | |/ / | |/| |
* | | | Merge branch '44582-clear-pipeline-status-cache' into 'master'Grzegorz Bizon2018-04-162-10/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Allow `rake cache:clear` clearing pipeline status cache Closes #44582 See merge request gitlab-org/gitlab-ce!18257
| * | | Allow `rake cache:clear` clearing pipeline status cache44582-clear-pipeline-status-cacheLin Jen-Shin2018-04-102-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use the correct key prefix * Clear old cache keys TODO: At some point we could remove clearing old cache keys.
* | | | Remove bogus '|' symbolJacob Vosmaer (GitLab)2018-04-131-1/+1
| |/ / |/| |
* | | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-132-8/+18
|\ \ \ | | | | | | | | | | | | | | | | Deprecate legacy disk paths See merge request gitlab-org/gitlab-ce!18332
| * | | Deprecate legacy disk pathsZeger-Jan van de Weg2018-04-122-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct disk access is impossible on environments where components run in their own container. There for constructing the path should not be done except for exceptional cases. One of the considerations, instead of logging, was to use Sentry. For now I've chosen not to use this as the impact of this change is hard to determine. Getting this in now will allow us to checkout the impact on dev.gitlab.org and staging.
* | | | Feature/add language in repository to apiRoger Rüttimann2018-04-131-0/+5
| | | |
* | | | Merge branch 'jprovazn-fix-references' into 'master'Douwe Maan2018-04-137-16/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix reference filters in group context See merge request gitlab-org/gitlab-ce!18340
| * | | | Fix reference filters in group contextJan Provaznik2018-04-127-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since !18150 abstract reference filter supports also `group` as a resource parent (not only `project`). Some reference filters, which inherit from abstract filter, depend on parent being `project` when checking a reference. This patch adds explicit check of parent class to the given filters.
* | | | | Merge branch 'dm-archived-read-only' into 'master'Robert Speicher2018-04-124-4/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Make archived projects completely read-only Closes #44788 See merge request gitlab-org/gitlab-ce!18136
| * | | | Correct permissions for creating merge requests from issuesBob Van Landuyt2018-04-113-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could only be possible for users that can create merge requests within a project. So they need to be a allowed to create a branch and create a merge request.
| * | | | Rename delete_protected_branch ability to push_to_delete_protected_branch to ↵Douwe Maan2018-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | prevent confusion with destroy_protected_branch
* | | | | Merge branch ↵Douwe Maan2018-04-126-7/+139
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-fail' into 'master' Backport of EE !4989 See merge request gitlab-org/gitlab-ce!18238
| * | | | | Backport of EE !4989backport-of-rd-3429-enabling-maximum-file-size-limit-in-repository-causes-pushes-to-failRubén Dávila2018-04-116-7/+139
| | | | | |
* | | | | | Merge branch 'rendering-markdown-multiple-projects' into 'master'Douwe Maan2018-04-1211-48/+123
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Optimise rendering of Markdown documents that belong to different projects See merge request gitlab-org/gitlab-ce!18157
| * | | | | Support Markdown rendering using multiple projectsrendering-markdown-multiple-projectsYorick Peterse2018-04-1111-48/+123
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the Markdown pipeline so it supports the rendering of multiple documents that may belong to different projects. An example of where this happens is when displaying the event feed of a group. In this case we retrieve events for all projects in the group. Previously we would group events per project and render these chunks separately, but this would result in many SQL queries being executed. By extending the Markdown pipeline to support this out of the box we can drastically reduce the number of SQL queries. To achieve this we introduce a new object to the pipeline: Banzai::RenderContext. This object simply wraps two other objects: an optional Project instance, and an optional User instance. On its own this wouldn't be very helpful, but a RenderContext can also be used to associate HTML documents with specific Project instances. This work is done in Banzai::ObjectRenderer and allows us to reuse as many queries (and results) as possible.
* | | | | Merge branch 'fix/gb/fix-pipeline-statuses-illustrations' into 'master'Marin Jankovski2018-04-121-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix empty state for build that does not have a trace Closes #45204 See merge request gitlab-org/gitlab-ce!18278
| * | | | | Add a test for job empty state with missing traceGrzegorz Bizon2018-04-111-1/+1
| | | | | |
| * | | | | Revert adding `Empty` extended status to avoid N+1 queriesGrzegorz Bizon2018-04-113-24/+3
| | | | | |
| * | | | | Extend specs for detailed build extended statusesGrzegorz Bizon2018-04-111-3/+3
| | | | | |
| * | | | | Fix empty state for build that doesn ot have a traceGrzegorz Bizon2018-04-113-1/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | It also adds a fallback that covers other edge cases that might surface later.
* | | | | Merge branch 'fix/wiki-find-file-gitaly' into 'master'Robert Speicher2018-04-111-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix finding wiki file when Gitaly is enabled Closes gitaly#1126 See merge request gitlab-org/gitlab-ce!18317
| * | | | Fix finding wiki file when Gitaly is enabledAhmad Sherif2018-04-111-1/+1
| |/ / / | | | | | | | | | | | | Fixes gitaly#1126
* | | | Merge branch 'zj-info-attributes' into 'master'Douwe Maan2018-04-114-59/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Client implementation for InfoAttributes See merge request gitlab-org/gitlab-ce!18261
View Lorry Controller Status