summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2018-04-053-0/+201
|\
| * Download LFS-files from object storage for exportsBob Van Landuyt2018-04-051-1/+23
| | | | | | | | | | Downloading the stream directly to the archive. In order to avoid conflicts with the cache.
| * Import projects with LFS objectsBob Van Landuyt2018-04-053-1/+141
| | | | | | | | | | If the LFS object already exist, we'll link it tot he existing one, if not we'll create it.
| * Export LFS Objects when exporting a projectBob Van Landuyt2018-04-051-0/+39
| | | | | | | | The LFS files will be included in the `lfs-objects` directory in the archive.
* | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵Douwe Maan2018-04-054-0/+72
|/ | | | | | | | | | 'security-10-6' [10.6] Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2366 # Conflicts: # app/helpers/services_helper.rb
* Merge branch 'osw-41401-render-mr-commit-sha-instead-diffs' into 'master'Sean McGivern2018-04-041-0/+35
|\ | | | | | | | | Render MR commit SHA instead "diffs" when viable on GFM See merge request gitlab-org/gitlab-ce!18141
| * Render MR commit SHA instead "diffs" when viableosw-41401-render-mr-commit-sha-instead-diffsOswaldo Ferreira2018-04-041-0/+35
| |
* | Add banzai filter to detect commit message trailers and properly link the usersOmar Mekky2018-04-041-0/+171
| |
* | Add support for Sidekiq JSON loggingStan Hu2018-04-042-0/+132
| | | | | | | | Closes #20060
* | Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' ↵Sean McGivern2018-04-044-12/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use shard name in Git::GitlabProjects instead of shard path Closes gitaly#1110 See merge request gitlab-org/gitlab-ce!18015
| * | Use shard name in Git::GitlabProjects instead of shard pathAhmad Sherif2018-04-034-12/+18
| | | | | | | | | | | | Closes gitaly#1110
* | | Add better LDAP connection handlingFrancisco Javier López2018-04-043-19/+99
| | |
* | | Backport Gitlab::Git::Checksum to CEDouglas Barbosa Alexandre2018-04-031-0/+38
| | |
* | | Merge branch 'rs-performance-bar-for-admins' into 'master'Rémy Coutable2018-04-031-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Always allow the performance bar to be enabled for admins See merge request gitlab-org/gitlab-ce!18137
| * | | Always allow the performance bar to be enabled for adminsrs-performance-bar-for-adminsRobert Speicher2018-04-021-0/+6
| | | |
* | | | Merge branch 'sh-move-sidekiq-exporter-logs' into 'master'Sean McGivern2018-04-031-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move Sidekiq exporter logs to log/sidekiq_exporter.log See merge request gitlab-org/gitlab-ce!18127
| * | | | Move Sidekiq exporter logs to log/sidekiq_exporter.logsh-move-sidekiq-exporter-logsStan Hu2018-04-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Sidekiq exporter logs were mixing with the normal Sidekiq logs. In order to support structured logging in Sidekiq, we either need to split this data out or convert the exporter to produce structured logs. Since Sidekiq job processing is fundamentally different information from Web server traffic, it seems cleaner to move the metrics traffic into a separate file, where they can be parsed by a different filter if needed. Relates to #20060
* | | | | Rename allow_private_networks to allow_local_networkDouwe Maan2018-04-021-6/+6
| | | | |
* | | | | Raise more descriptive errors when URLs are blockedDouwe Maan2018-04-021-3/+3
| |/ / / |/| | |
* | | | Merge branch 'sh-cleanup-crlf-gitmodules' into 'master'Douwe Maan2018-04-021-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle CR-LFs properly in .gitmodules file Closes #2262 See merge request gitlab-org/gitlab-ce!18117
| * | | | Handle CR-LFs properly in .gitmodules filesh-cleanup-crlf-gitmodulesStan Hu2018-03-301-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | Any submodule lines that had a CR-LF ending would be ignored by the parser. Closes gitlab-org/gitlab-ce#2262
* | | | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master'Kamil Trzciński2018-04-0210-48/+226
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline variables expression in only/except configuration Closes #37397 See merge request gitlab-org/gitlab-ce!17316
| * \ \ \ Merge branch 'master' into 'feature/gb/variables-expressions-in-only-except'Grzegorz Bizon2018-03-2916-93/+461
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Conflicts: app/models/ci/build.rb
| * | | | | Fix invalid assertion in YAML processor specsGrzegorz Bizon2018-03-271-1/+1
| | | | | |
| * | | | | Do not raise when validating variables expressionGrzegorz Bizon2018-03-271-1/+9
| | | | | |
| * | | | | Improve specs for pipeline variables expressions policyGrzegorz Bizon2018-03-271-4/+10
| | | | | |
| * | | | | Improve specs for predefined build variablesGrzegorz Bizon2018-03-271-4/+2
| | | | | |
| * | | | | Add test for evaluating secret variables in a policyGrzegorz Bizon2018-03-271-2/+10
| | | | | |
| * | | | | Merge branch 'master' into feature/gb/variables-expressions-in-only-exceptGrzegorz Bizon2018-03-2724-52/+423
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (199 commits) Conflicts: lib/gitlab/ci/pipeline/seed/stage.rb
| * | | | | | Expose evaluable variables method from build objectGrzegorz Bizon2018-03-231-1/+6
| | | | | | |
| * | | | | | Simplify how we set pipeline builds user on creationGrzegorz Bizon2018-03-232-20/+0
| | | | | | |
| * | | | | | Fix variables expression build policy specsGrzegorz Bizon2018-03-231-12/+14
| | | | | | |
| * | | | | | Integrate build seeds with variables expressions policyGrzegorz Bizon2018-03-231-16/+0
| | | | | | |
| * | | | | | Integration variables collections with expressionsGrzegorz Bizon2018-03-234-23/+54
| | | | | | |
| * | | | | | Integrate variables policy with new pipeline servicesGrzegorz Bizon2018-03-231-7/+7
| | | | | | |
| * | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into ↵Grzegorz Bizon2018-03-23127-2031/+3826
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/variables-expressions-in-only-except * backstage/gb/populating-pipeline-refactoring: (860 commits) Add specs for extracted pipeline-related methods Bring seeds size method back to CI/CD pipeline class Improve YAML processor specs and remove unused code Fix static analysis and tests related to YAML processing Add specs for pipeline chain that builds stages and jobs Do not select included stage seeds in populate chain Decouple YAML processor from pipeline objects Move policy related specs our of YAML processor tests Fix rubocop offense in pipeline build seed class Add a guard clause to avoid creating empty stages Evaluate only/except policies outside of YAML processor Make it easier to test pipeline stage seeds Reduce stage seeds coupling between pipeline and YAML Add specs for chain element that populates a pipeline Populate pipeline with objects before creating it Remove legacy service for creating pipeline stages Decouple pipeline stage seeds from building environments Support building all pipeline resource before saving Introduce pipeline build seeds Start building abstraction over pipeline seeds ... Conflicts: lib/gitlab/ci/yaml_processor.rb spec/lib/gitlab/ci/yaml_processor_spec.rb
| * | | | | | | Add support for checking attributes in build policiesGrzegorz Bizon2018-03-011-5/+6
| | | | | | | |
| * | | | | | | Add YAML integration tests for pipeline expressionsGrzegorz Bizon2018-02-281-0/+24
| | | | | | | |
| * | | | | | | Use squiggly heredoc to improve YAML processor specsGrzegorz Bizon2018-02-281-25/+25
| | | | | | | |
| * | | | | | | Add build policy for pipeline expressionsGrzegorz Bizon2018-02-281-0/+41
| | | | | | | |
| * | | | | | | Add method that checks if pipeline expression is truthyGrzegorz Bizon2018-02-281-11/+38
| | | | | | | |
| * | | | | | | Allow using an empty string with pipeline expressionsGrzegorz Bizon2018-02-281-0/+16
| | | | | | | |
| * | | | | | | Merge branch 'feature/gb/pipeline-variable-expressions' into ↵Grzegorz Bizon2018-02-281-0/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/variables-expressions-in-only-except * feature/gb/pipeline-variable-expressions: Do not use keyword args to pass expression variables
| * | | | | | | | Add support for only/except: variables CI/CD configGrzegorz Bizon2018-02-282-9/+56
| | | | | | | | |
* | | | | | | | | Merge branch '44291-usage-ping-for-kubernetes-integration' into 'master'Kamil Trzciński2018-04-021-0/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Usage ping for Kubernetes integration" Closes #44291 See merge request gitlab-org/gitlab-ce!17922
| * | | | | | | | Merge branch 'master' into 44291-usage-ping-for-kubernetes-integrationMatija Čupić2018-03-2940-784/+1434
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Check cluster usage datapoint counts44291-usage-ping-for-kubernetes-integrationMatija Čupić2018-03-271-0/+17
| | | | | | | | |
| * | | | | | | | Rename cluster datapoint names to be more specificMatija Čupić2018-03-261-6/+6
| | | | | | | | |
| * | | | | | | | Add additional cluster usage metricsMatija Čupić2018-03-221-0/+6
| | | | | | | | |
* | | | | | | | | Extend API for exporting a project with direct upload URLFrancisco Javier López2018-03-303-0/+169
| | | | | | | | |
View Lorry Controller Status