summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'unify-parallel_importer' into 'master'Stan Hu2018-06-131-0/+9
|\ | | | | | | | | Bring changes from EE for parallel_importer.rb See merge request gitlab-org/gitlab-ce!19779
| * Bring changes from EE for parallel_importer.rbLin Jen-Shin2018-06-141-0/+9
| |
* | Add support for verifying remote uploads, artifacts, and LFS objects in ↵Michael Kozono2018-06-135-16/+79
|/ | | | check rake tasks
* Merge branch 'zj-empty-batch-no-rpc' into 'master'Rémy Coutable2018-06-131-0/+2
|\ | | | | | | | | ListCommitByOid isn't called with an empty batch See merge request gitlab-org/gitlab-ce!19753
| * ListCommitByOid isn't called with an empty batchZeger-Jan van de Weg2018-06-131-0/+2
| | | | | | | | | | | | Batching commits for performance improvements, might lead to empty batches being used. This isn't the case yet, but to guard against this in future cases, a guard clause is added.
* | Merge branch 'sql-buckets' into 'master'Stan Hu2018-06-132-2/+2
|\ \ | |/ |/| | | | | Adjust SQL and transaction Prometheus buckets See merge request gitlab-org/gitlab-ce!19650
| * Adjust SQL and transaction Prometheus bucketssql-bucketsYorick Peterse2018-06-112-2/+2
| | | | | | | | | | This allows us to better calculate Apdex scores, instead of having to use the 0.1 and 1.0 buckets.
* | Resolve "Quick actions are case sensitive"Jan2018-06-132-5/+5
| |
* | Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-131-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Regressions for assigning group milestone from ancestor" Closes #47735 See merge request gitlab-org/gitlab-ce!19721
| * | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regressionMario de la Ossa2018-06-121-0/+2
| | |
* | | Merge branch 'zj-compare-source-branch' into 'master'Sean McGivern2018-06-131-11/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Migrate compare_source_branch to use only Gitaly Closes gitaly#771 See merge request gitlab-org/gitlab-ce!19700
| * | Migrate compare_source_branch to use only GitalyZeger-Jan van de Weg2018-06-121-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially expected this to be a full blown migration, but that wasn't the case as we could fetch to a reference that would be deleted after the instanciation of the Diff object. This is a racy RPC, as #delete_refs is called and garbage collections runs right than, the commit can't be found later. Closes https://gitlab.com/gitlab-org/gitaly/issues/771
* | | Merge branch 'pr-importer-io-extra-error-handling' into 'master'Nick Thomas2018-06-121-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure MR diffs always exist in the PR importer Closes #47312 See merge request gitlab-org/gitlab-ce!19704
| * | | Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handlingYorick Peterse2018-06-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In rare cases it could happen that an MR was created, but creating the MR diffs somehow failed (e.g. due to an error). This commit adds an additional check to make sure MR diffs are always present when importing GitHub pull requests.
* | | | Merge branch 'gitaly-disk-access-3' into 'master'Douwe Maan2018-06-124-42/+62
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Find and mark more Git disk access locations, part 2 See merge request gitlab-org/gitlab-ce!19437
| * | | Find and mark more Git disk access locations, part 2Jacob Vosmaer2018-06-124-42/+62
| | | |
* | | | Merge branch 'da-port-cte-to-ce' into 'master'Yorick Peterse2018-06-121-0/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add Gitlab::SQL:CTE for easily building CTE statements See merge request gitlab-org/gitlab-ce!19652
| * | | | Add Gitlab::SQL:CTE for easily building CTE statementsDouglas Barbosa Alexandre2018-06-111-0/+50
| | |_|/ | |/| |
* | | | Move Gitaly branch/tag/ref RPC's to opt-outJacob Vosmaer (GitLab)2018-06-121-8/+8
| |_|/ |/| |
* | | Merge branch 'sh-expire-content-cache-after-import' into 'master'Mayra Cabrera2018-06-111-2/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Expire Wiki content cache after importing a repository Closes #47546 See merge request gitlab-org/gitlab-ce!19617
| * | Expire Wiki content cache after importing a repositoryStan Hu2018-06-111-2/+0
| | | | | | | | | | | | | | | | | | | | | The cache state for Wikis that were imported via GitHub or Bitbucket does not appear to have been flushed after a successful import. Closes #47546
* | | Avoid checking the user format in every url validationFrancisco Javier López2018-06-111-2/+2
| | |
* | | Migrate CycleAnalytics::CommitCount to GitalyKim Carlbäcker2018-06-111-15/+5
| | |
* | | Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)2018-06-115-14/+33
| | |
* | | Move gitaly_blame, gitaly_count_commits, gitaly_commit_count to opt-outJacob Vosmaer (GitLab)2018-06-112-3/+3
|/ /
* | Merge branch 'use-restore-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-081-18/+37
|\ \ | | | | | | | | | | | | Use RestoreCustomHooks RPC in restore rake task See merge request gitlab-org/gitlab-ce!19370
| * | RefactorAhmad Hassan2018-06-081-35/+32
| | |
| * | Use RestoreCustomHooks RPC in restore rake taskAhmad Hassan2018-06-071-0/+22
| | |
* | | Remove Gitlab::Popen dependency from lib/gitlab/gitJacob Vosmaer2018-06-082-1/+12
| |/ |/|
* | Merge branch 'add-new-arg-to-git-rev-list-call' into 'master'Douwe Maan2018-06-072-6/+23
|\ \ | | | | | | | | | | | | | | | | | | Pass the --in-commit-order arg to `git-rev-list` Closes #45062 See merge request gitlab-org/gitlab-ce!19494
| * | Pass the --in-commit-order arg to `git-rev-list`Rubén Dávila2018-06-072-6/+23
| | | | | | | | | | | | | | | @jamedjo has found a good improvement in the performance of the LFS integrity check by passing this arg
* | | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-072-1/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
| * | | dry up asset path helper callsAlexis Reigel2018-06-051-3/+10
| | | |
| * | | the '?' favicon hack doesn't seem to be requiredAlexis Reigel2018-06-051-8/+1
| | | | | | | | | | | | | | | | probably due to recent changes in `UploadsController`.
| * | | remove favicon preview on appearance pageAlexis Reigel2018-06-051-6/+0
| | | |
| * | | remove all .ico favicon variations, use png alwaysAlexis Reigel2018-06-052-6/+5
| | | | | | | | | | | | | | | | | | | | the ci status icons are generated client side, wo we don't need the static files anymore.
| * | | create favicon overlay on the clientAlexis Reigel2018-06-051-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the initial reason for this change was that graphicsmagick does not support writing to ico files. this fact lead to a chain of changes: 1. use png instead of ico (browser support is good enough) 2. render the overlays on the client using the canvas API. this way we only need to store the original favion and generate the overlay versions dynamically. this change also enables (next step) to simplify the handling of the stock favicons as well, as we don't need to generate all the versions upfront.
| * | | call Gitlab::Favicon.status in serializerAlexis Reigel2018-06-059-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this ways we can keep the `lib/gitlab/ci/status/*` classes to return the bare favicon name as it was before. also the favicon uploader versions are now have the same names as the stock favicons (+ `favicon_` prefix), which makes working with the status names easier.
| * | | add request store caching to faviconAlexis Reigel2018-06-051-1/+1
| | | |
| * | | Add a '?' to the custom favicon's urlsAlexis Reigel2018-06-051-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the '?' at the end of the favicon url the custom favicon (i.e. the favicons that are served through `UploadController`) are not shown in the browser. It may have something to do with how `#send_file` / `#send_data` set http headers. When serving the same icon file from the public directory everything is fine.
| * | | use custom favicon for ci build status faviconsAlexis Reigel2018-06-059-11/+23
| | | |
| * | | extract favicon logic to lib classAlexis Reigel2018-06-051-0/+23
| | | |
* | | | Merge branch 'sh-fix-schema-migrations-seq-scans' into 'master'Douwe Maan2018-06-071-0/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Avoid sequential scans loading schema_migrations table when loading application settings See merge request gitlab-org/gitlab-ce!19541
| * | | Make Gitlab::CurrentSettings.current_application_settings return cached ↵Rémy Coutable2018-06-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | settings early if they exist without issuing any DB query Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Avoid sequential scans loading schema_migrations table when loading ↵Stan Hu2018-06-071-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | application settings This was causing significant performance problems in production, and this commit reverts to the original behavior.
* | | | Add git filter flag only if it is supportedFrancisco Javier López2018-06-071-1/+5
| | | |
* | | | Resolve "Hashed Storage: Make possible to migrate single project"Gabriel Mazetto2018-06-072-1/+70
|/ / /
* | | Add installation type to usage ping dataBalasankar C2018-06-071-0/+1
| | |
* | | Restore navigation theme orderGeorge Tsiolis2018-06-071-8/+8
| |/ |/|
* | Merge branch '45505-lograge_formatter_encoding' into 'master'Kamil Trzciński2018-06-071-0/+17
|\ \ | | | | | | | | | | | | | | | | | | Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter Closes #45505 See merge request gitlab-org/gitlab-ce!19244