Skip to content

Commit

Permalink
Oss sync (#526)
Browse files Browse the repository at this point in the history
* chore: moved k8s library to common-lib and added scripts for adding sshTunnel config to clusters (#3848)

* added db scripts for cluster table

* updated script

* renamed script no

* changed sql script

* wip

* updated dependency

* wip

* bumped common-lib-version

* updated vendor

* vendor files

* updated sql script no.

* added insecureTls connection param in kubelink requests

* updated sql script no.

* added argoproj assets

* wip

* added argoproj files

* updated .gitignore

* updated sql script no

* updated sql script no

* shifted common-lib to major version import

* check for active ci_pipeline_material (#4072)

---------

Co-authored-by: Ashish-devtron <123808329+Ashish-devtron@users.noreply.github.com>
  • Loading branch information
kartik-579 and Ashish-devtron committed Oct 11, 2023
1 parent 8995929 commit f438b94
Showing 1 changed file with 3 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,9 @@ func (impl CiPipelineRepositoryImpl) FindById(id int) (pipeline *CiPipeline, err
pipeline = &CiPipeline{Id: id}
err = impl.dbConnection.Model(pipeline).
Column("ci_pipeline.*", "App", "CiPipelineMaterials", "CiTemplate", "CiTemplate.DockerRegistry", "CiPipelineMaterials.GitMaterial").
Relation("CiPipelineMaterials", func(q *orm.Query) (query *orm.Query, err error) {
return q.Where("(ci_pipeline_material.active=true)"), nil
}).
Where("ci_pipeline.id= ?", id).
Where("ci_pipeline.deleted =? ", false).
Select()
Expand Down

0 comments on commit f438b94

Please sign in to comment.