summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'Douwe Maan2018-12-171-0/+1
|\ | | | | | | | | | | | | Remove the project_cleanup feature flag Closes #55230 See merge request gitlab-org/gitlab-ce!23814
| * Fix repository cleanup with object storage onNick Thomas2018-12-151-0/+1
| | | | | | | | | | | | | | | | When the BFG object map file is in object storage (i.e., uploads in general are placed into object storage), we get an instance of the Gitlab::HttpIO class. This doesn't behave as expected when you try to read past EOF, so we need to explicitly check for this condition to avoid ending up in a tight loop around io.read
* | Merge branch ↵Yorick Peterse2018-12-172-21/+104
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00acef434031b5dc0bf39576a9e83802c7806842-revert' into 'master' Resolve "Un-revert https://gitlab.com/gitlab-org/gitlab-ce/commit/00acef434031b5dc0bf39576a9e83802c7806842 revert" Closes #55433 See merge request gitlab-org/gitlab-ce!23861
| * | Revert "Revert "LfsToken uses JSONWebToken::HMACToken by default""Ash McKenzie2018-12-172-21/+104
| |/ | | | | | | This reverts commit 00acef434031b5dc0bf39576a9e83802c7806842.
* | Remove rails4 specific codeJasper Maes2018-12-1612-109/+23
|/
* Merge branch '54786-mr-empty-file-display' into 'master'Nick Thomas2018-12-151-0/+4
|\ | | | | | | | | | | | | Display empty files properly on MR diffs Closes #54786 See merge request gitlab-org/gitlab-ce!23671
| * Display empty files properly on MR diffsSean Nichols2018-12-111-0/+4
| |
* | Merge branch 'rs-transient-help-page-failure' into 'master'Stan Hu2018-12-151-3/+4
|\ \ | | | | | | | | | | | | | | | | | | Resolve transient failure in Help page spec Closes #55372 See merge request gitlab-org/gitlab-ce!23839
| * | Use class methods for VersionCheckRobert Speicher2018-12-141-3/+4
| | | | | | | | | | | | | | | | | | | | | All of these methods are stateless, there was no point to have them as instance methods. Mostly this allows us to remove an `allow_any_instance_of` usage.
* | | Remove rails 4 support in CI, Gemfiles, bin/ and config/Jasper Maes2018-12-141-16/+0
|/ /
* | Merge branch 'remove-issue-suggestions-flag' into 'master'Douwe Maan2018-12-142-4/+8
|\ \ | | | | | | | | | | | | | | | | | | Remove issue_suggestions feature flag Closes #55166 See merge request gitlab-org/gitlab-ce!23723
| * | Pass on arguments passed to the FeatureConstrainerBob Van Landuyt2018-12-141-4/+4
| | | | | | | | | | | | | | | All arguments passed to the `FeatureConstrainer` will be passed on to the `Feature.enabled?` check.
| * | Enable GraphQL API endpointPhil Hughes2018-12-132-4/+8
| | |
* | | Merge branch 'ac-releases-name-sha-author' into 'master'Kamil Trzciński2018-12-141-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Add name, author and sha to releases See merge request gitlab-org/gitlab-ce!23763
| * | | Add name, author and sha to releasesAlessio Caiazza2018-12-131-1/+2
| |/ / | | | | | | | | | | | | | | | This commit adds a name to each release, defaulting it to tag name, keeps track of the SHA when a new release is created and tracks the current user as release author.
* | | Fix deprecation: Passing ActiveRecord::Base objects to ↵Jasper Maes2018-12-131-1/+1
| | | | | | | | | | | | sanitize_sql_hash_for_assignment
* | | Allow suggesting single line changes in diffsOswaldo Ferreira2018-12-1311-2/+103
| | |
* | | Merge branch 'zj-backup-restore-object-pools' into 'master'Douwe Maan2018-12-131-1/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Restore Object Pools when restoring an object pool Closes gitaly#1355 See merge request gitlab-org/gitlab-ce!23682
| * | | Restore Object Pools when restoring an object poolZeger-Jan van de Weg2018-12-131-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pool repositories are persisted in the database, and when the DB is restored, the data need to be restored on disk. This is done by resetting the state machine and rescheduling the object pool creation. This is not an exact replica of the state like at the time of the creation of the backup. However, the data is consistent again. Dumping isn't required as internally GitLab uses git bundles which bundle all refs and include all objects in the bundle that they require, reduplicating as more repositories get backed up. This does require more data to be stored. Fixes https://gitlab.com/gitlab-org/gitaly/issues/1355
* | | | Re-define default only except policyKamil Trzciński2018-12-134-50/+15
| |/ / |/| |
* | | Merge branch 'feature/gb/ci-pipeline-bridge' into 'master'Kamil Trzciński2018-12-122-0/+42
|\ \ \ | | | | | | | | | | | | | | | | Add basic implementation of CI/CD bridge job See merge request gitlab-org/gitlab-ce!23730
| * | | Add basic implementation of CI/CD bridge jobGrzegorz Bizon2018-12-122-0/+42
| | | |
* | | | Merge branch 'fix-rubocop-issues' into 'master'Rémy Coutable2018-12-122-5/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix ConstantName rubocop offense See merge request gitlab-org/gitlab-ce!23677
| * | | Fix ConstantName rubocop offenseSemyon Pupkov2018-12-092-5/+5
| | | |
* | | | Merge branch 'sh-fix-diff-check-issue-55137-ce' into 'master'Stan Hu2018-12-111-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE] Fix DiffCheck failing due to invalid string argument See merge request gitlab-org/gitlab-ce!23741
| * | | | Remove now-unnecessary checksDouwe Maan2018-12-111-1/+1
| | | | |
| * | | | Fix DiffCheck failing due to invalid string argumentStan Hu2018-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | Hot patch for #55137
* | | | | Update GitLab Workhorse to v8.0.0Nick Thomas2018-12-111-1/+0
| | | | |
* | | | | Merge branch '7788_parse_license_management_reports_in_be-ce' into 'master'Kamil Trzciński2018-12-114-22/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Generalise test compare service See merge request gitlab-org/gitlab-ce!22833
| * | | | | Generalise test compare serviceGilbert Roulot2018-12-114-22/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | It adds a base class for CompareTestReportsService containing common code with CompareLicenseManagementReportsService which is present in GitLab Enterprise Edition.
* | | | | Fix MR pipelines run on only: refexShinya Maeda2018-12-111-4/+8
|/ / / /
* | | | Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'Douwe Maan2018-12-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a frozen string error in lib/gitlab/utils.rb Closes #55116 See merge request gitlab-org/gitlab-ce!23690
| * | | | Fix a frozen string error in lib/gitlab/utils.rbRémy Coutable2018-12-101-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'sh-remove-gitlab-shell-include' into 'master'Rémy Coutable2018-12-102-3/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Remove unnecessary includes of ShellAdapter See merge request gitlab-org/gitlab-ce!23607
| * | | Remove unnecessary includes of ShellAdapterStan Hu2018-12-052-3/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Determined by running the script: ``` included = `git grep --name-only ShellAdapter`.chomp.split("\n") used = `git grep --name-only gitlab_shell`.chomp.split("\n") included - used ```
* | | Merge branch 'sh-ignore-arrays-url-sanitizer' into 'master'Rémy Coutable2018-12-101-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only allow strings in URL::Sanitizer.valid? Closes #55079 See merge request gitlab-org/gitlab-ce!23675
| * | | Only allow strings in URL::Sanitizer.valid?Stan Hu2018-12-091-0/+1
| | |/ | |/| | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55079
* | | Merge branch ↵Grzegorz Bizon2018-12-101-0/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '54626-able-to-download-a-single-archive-file-with-api-by-ref-name' into 'master' Add endpoint to download single artifact by ref Closes #54626 See merge request gitlab-org/gitlab-ce!23538
| * | | Add endpoint to download single artifact by refSteve Azzopardi2018-12-071-0/+24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Add a new endpoint `projects/:id/jobs/artifacts/:ref_name/raw/*artifact_path?job=name` which is the close the web URL for consistency sake. This endpoint can be used to download a single file from artifacts for the specified ref and job. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54626
* | | Merge branch 'osw-update-mr-metrics-with-events-data' into 'master'Douwe Maan2018-12-101-0/+99
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Populate MR metrics with events table information (migration) Closes #41587 See merge request gitlab-org/gitlab-ce!23564
| * | | Populate MR metrics with events table information (migration)osw-update-mr-metrics-with-events-dataOswaldo Ferreira2018-12-061-0/+99
| | | |
* | | | Use new reports syntax for SAST in Auto DevOpsFabio Busatto2018-12-101-1/+2
| |_|/ |/| |
* | | Resolve "Extended user centric tooltips"Tim Zallmann2018-12-081-1/+1
| | |
* | | Merge branch 'ce-jej/group-saml-sso-button-link-description' into 'master'Clement Ho2018-12-081-1/+8
|\ \ \ | | | | | | | | | | | | | | | | [CE] Backport SAML unlink changes: UrlBlocker#ascii_only See merge request gitlab-org/gitlab-ce!23627
| * | | Allow URLs to be validated as ascii_onlyJames Edwards-Jones2018-12-061-1/+8
| | | | | | | | | | | | | | | | | | | | Restricts unicode characters and IDNA deviations which could be used in a phishing attack
* | | | Merge branch ↵Stan Hu2018-12-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55054-correlation-ids-being-passed-through-grpc-metadata-are-incorrect' into 'master' Fix for incorrect Correlation-ID key being passed through GRPC metadata Closes #55054 See merge request gitlab-org/gitlab-ce!23666
| * | | | Rename the correlation field from `correlation_id` to `x-gitlab-correlation-id`Andrew Newdigate2018-12-071-1/+1
| | | | |
* | | | | Merge branch 'tc-backfill-hashed-project_repositories' into 'master'Stan Hu2018-12-071-0/+134
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fill project_repositories for hashed storage projects Closes #48527 See merge request gitlab-org/gitlab-ce!23482
| * | | | Fill project_repositories for hashed storageDouglas Barbosa Alexandre2018-12-061-41/+51
| | | | |
| * | | | Fill project_repositories for hashed storageToon Claes2018-12-061-0/+124
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This adds a background migration that will ensure all projects that are on hashed storage have a row in `project_repositories`. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/48527
View Lorry Controller Status