Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add `direct_upload` setting for artifactsdirect-upload-of-artifacts | Kamil Trzciński | 2018-04-05 | 6 | -41/+71 |
| | |||||
* | Remove artifacts_file/metadata from project export | Kamil Trzciński | 2018-04-05 | 1 | -0/+2 |
| | |||||
* | Resolve "Allow the configuration of a project's merge method via the API" | Jan | 2018-04-04 | 2 | -0/+3 |
| | |||||
* | Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' ↵ | Sean McGivern | 2018-04-04 | 6 | -47/+44 |
|\ | | | | | | | | | | | | | | | | | 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 path | Ahmad Sherif | 2018-04-03 | 6 | -47/+44 |
| | | | | | | | | Closes gitaly#1110 | ||||
* | | Add better LDAP connection handling | Francisco Javier López | 2018-04-04 | 4 | -8/+47 |
| | | |||||
* | | Backport Gitlab::Git::Checksum to CE | Douglas Barbosa Alexandre | 2018-04-03 | 1 | -0/+82 |
| | | |||||
* | | Merge branch '43745-store-metadata-checksum-for-artifacts' into 'master' | Kamil Trzciński | 2018-04-03 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | Store sha256 checksum of Metadata in `ci_job_artifacts` table See merge request gitlab-org/gitlab-ce!18149 | ||||
| * | | Store metadata checksum for artifacts43745-store-metadata-checksum-for-artifacts | Shinya Maeda | 2018-04-03 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch '44902-remove-rake-test-ci' into 'master' | Robert Speicher | 2018-04-03 | 1 | -5/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove Rake test_ci task Closes #44902 See merge request gitlab-org/gitlab-ce!18139 | ||||
| * | | | Remove test_ci rake task | Takuya Noguchi | 2018-04-03 | 1 | -5/+0 |
| |/ / | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com> | ||||
* | | | Use gitlab_environment because we need: | Lin Jen-Shin | 2018-04-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | * ask_to_continue * Gitlab::TaskAbortedByUserError | ||||
* | | | Merge branch 'rs-performance-bar-for-admins' into 'master' | Rémy Coutable | 2018-04-03 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | 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-admins | Robert Speicher | 2018-04-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'sh-move-sidekiq-exporter-logs' into 'master' | Sean McGivern | 2018-04-03 | 1 | -1/+9 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | 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-logs | Stan Hu | 2018-04-02 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_network | Douwe Maan | 2018-04-02 | 2 | -3/+3 |
| | | | | |||||
* | | | | Make error messages even more descriptive | Douwe Maan | 2018-04-02 | 1 | -33/+47 |
| | | | | |||||
* | | | | Raise more descriptive errors when URLs are blocked | Douwe Maan | 2018-04-02 | 3 | -20/+40 |
| |/ / |/| | | |||||
* | | | Merge branch 'sh-cleanup-crlf-gitmodules' into 'master' | Douwe Maan | 2018-04-02 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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-gitmodules | Stan Hu | 2018-03-30 | 1 | -1/+3 |
| |/ / | | | | | | | | | | | | | | | | Any submodule lines that had a CR-LF ending would be ignored by the parser. Closes gitlab-org/gitlab-ce#2262 | ||||
* | | | Merge branch '44776-fix-upload-migrate-fails-for-group' into 'master' | Sean McGivern | 2018-04-02 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Migrate upload task fails for Groups" Closes #44776 See merge request gitlab-org/gitlab-ce!18088 | ||||
| * | | | fix the rake task from being to strict about Group | Micaël Bergeron | 2018-04-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'blackst0ne-bump-html-pipeline-gem' into 'master' | Sean McGivern | 2018-04-02 | 3 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Bump html-pipeline to 2.7.1 Closes #24039 See merge request gitlab-org/gitlab-ce!18132 | ||||
| * | | | Bump html-pipeline to 2.7.1blackst0ne-bump-html-pipeline-gem | blackst0ne | 2018-04-02 | 3 | -3/+3 |
| |/ / | |||||
* | | | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master' | Kamil Trzciński | 2018-04-02 | 13 | -32/+75 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline variables expression in only/except configuration Closes #37397 See merge request gitlab-org/gitlab-ce!17316 | ||||
| * | | | Fix build variables policy after renaming methods | Grzegorz Bizon | 2018-03-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into 'feature/gb/variables-expressions-in-only-except' | Grzegorz Bizon | 2018-03-29 | 33 | -104/+421 |
| |\ \ \ | | | | | | | | | | | | | | | | Conflicts: app/models/ci/build.rb | ||||
| * | | | | Do not raise when validating variables expression | Grzegorz Bizon | 2018-03-27 | 2 | -5/+1 |
| | | | | | |||||
| * | | | | Decouple build variables from persisted environment | Grzegorz Bizon | 2018-03-27 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into feature/gb/variables-expressions-in-only-except | Grzegorz Bizon | 2018-03-27 | 50 | -166/+371 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (199 commits) Conflicts: lib/gitlab/ci/pipeline/seed/stage.rb | ||||
| * | | | | | Expose evaluable variables method from build object | Grzegorz Bizon | 2018-03-23 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | Simplify how we set pipeline builds user on creation | Grzegorz Bizon | 2018-03-23 | 3 | -14/+1 |
| | | | | | | |||||
| * | | | | | Integrate build seeds with variables expressions policy | Grzegorz Bizon | 2018-03-23 | 5 | -12/+15 |
| | | | | | | |||||
| * | | | | | Integration variables collections with expressions | Grzegorz Bizon | 2018-03-23 | 5 | -22/+17 |
| | | | | | | |||||
| * | | | | | Integrate variables policy with new pipeline services | Grzegorz Bizon | 2018-03-23 | 5 | -7/+7 |
| | | | | | | |||||
| * | | | | | Merge branch 'backstage/gb/populating-pipeline-refactoring' into ↵ | Grzegorz Bizon | 2018-03-23 | 226 | -2922/+5409 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 policies | Grzegorz Bizon | 2018-03-01 | 6 | -12/+20 |
| | | | | | | | |||||
| * | | | | | | Revert support for simplified pipeline expressions | Grzegorz Bizon | 2018-03-01 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | Add build policy for pipeline expressions | Grzegorz Bizon | 2018-02-28 | 1 | -0/+22 |
| | | | | | | | |||||
| * | | | | | | Add method that checks if pipeline expression is truthy | Grzegorz Bizon | 2018-02-28 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Allow using an empty string with pipeline expressions | Grzegorz Bizon | 2018-02-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Use pipeline runtime variables in expressions | Grzegorz Bizon | 2018-02-28 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'feature/gb/pipeline-variable-expressions' into ↵ | Grzegorz Bizon | 2018-02-28 | 5 | -6/+6 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 config | Grzegorz Bizon | 2018-02-28 | 2 | -3/+31 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '44291-usage-ping-for-kubernetes-integration' into 'master' | Kamil Trzciński | 2018-04-02 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Usage ping for Kubernetes integration" Closes #44291 See merge request gitlab-org/gitlab-ce!17922 | ||||
| * | | | | | | | Extract cluster installed query to scope | Matija Čupić | 2018-03-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into 44291-usage-ping-for-kubernetes-integration | Matija Čupić | 2018-03-29 | 77 | -307/+896 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Change order of queries for gcp cluster usage data count | Matija Čupić | 2018-03-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Use cluster scopes to deflate usage data implementation | Matija Čupić | 2018-03-29 | 1 | -6/+6 |
| | | | | | | | |