summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-n-1-root-show' into 'master'Douwe Maan2018-02-081-4/+1
|\
| * Don't allow N +1 calls from Root#showZeger-Jan van de Weg2018-02-071-4/+1
* | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-071-0/+1
|\ \
| * \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0638-130/+260
| |\ \
| * \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-313-8/+22
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-2915-55/+83
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-1722-15/+91
| |\ \ \ \ \
| * | | | | | Manual Configuration instead of Activation. Prometheus Service just got a bit...Pawel Chojnacki2018-01-021-0/+1
* | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-073-3/+75
* | | | | | | Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'Kamil Trzciński2018-02-071-4/+1
|\ \ \ \ \ \ \
| * | | | | | | Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewerDylan Griffith2018-02-071-4/+1
* | | | | | | | Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'Kamil Trzciński2018-02-072-75/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix static_analysis failurece-39118-dynamic-pipeline-variables-feMatija Čupić2018-02-062-6/+22
| * | | | | | | | Switch emphasis from controller format to updateMatija Čupić2018-02-052-14/+14
| * | | | | | | | Remove usage of VariablePresenter in controllerMatija Čupić2018-02-052-16/+4
| * | | | | | | | Add GroupVariableSerializer for Ci::GroupVariableMatija Čupić2018-02-051-2/+2
| * | | | | | | | Add VariableSerializer for Ci::VariableMatija Čupić2018-02-051-2/+2
| * | | | | | | | Return all variables after UPDATEMatija Čupić2018-02-052-2/+12
| * | | | | | | | Use `resource` in Group Variables routing schemeMatija Čupić2018-02-051-1/+12
| * | | | | | | | Use `resource` in Project Variables routing schemeMatija Čupić2018-02-051-1/+12
| * | | | | | | | Format validation errors as human readable messagesMatija Čupić2018-02-052-2/+2
| * | | | | | | | Pass validation errors in JSON endpointMatija Čupić2018-02-052-2/+2
| * | | | | | | | Remove redundant routes in Groups::VariablesControllerMatija Čupić2018-02-051-49/+0
| * | | | | | | | Port #save_multiple to Groups::VariablesControllerMatija Čupić2018-02-051-1/+15
| * | | | | | | | Remove redundant routes in VariablesControllerMatija Čupić2018-02-051-51/+0
| * | | | | | | | Use nested attributes for updating multiple variablesMatija Čupić2018-02-051-21/+3
| * | | | | | | | Add destroy functionality to save_multipleMatija Čupić2018-02-051-2/+9
| * | | | | | | | Move variable loading into before_actionMatija Čupić2018-02-051-12/+12
| * | | | | | | | Refactor VariablesController#save_multipleMatija Čupić2018-02-051-9/+13
| * | | | | | | | Implement multiple variable handling actionMatija Čupić2018-02-051-1/+18
| * | | | | | | | Stub multiple variable controller methodMatija Čupić2018-02-051-0/+4
* | | | | | | | | Let CI catch N + 1 callszj-n-1-merge-requests-showZeger-Jan van de Weg2018-02-071-4/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'master' into '26388-push-to-create-a-new-project'Douwe Maan2018-02-063-6/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'master' into 'zj-wiki-page-versions'Douwe Maan2018-02-0642-139/+290
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-062-4/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-062-4/+4
| * | | | | | | | | Client implementation for WikiPageVerionZeger-Jan van de Weg2018-01-221-2/+2
* | | | | | | | | | Moves project creationg to git access check for git pushTiago Botelho2018-02-061-12/+7
* | | | | | | | | | Move new project on push logic to a serviceTiago Botelho2018-02-061-22/+11
* | | | | | | | | | Add specsTiago Botelho2018-02-061-0/+2
* | | | | | | | | | Adds remote messsage when project is created in a push over SSH or HTTPTiago Botelho2018-02-061-15/+23
* | | | | | | | | | Adds option to push over SSH to create a new projectTiago Botelho2018-02-061-5/+5
* | | | | | | | | | Adds option to push over HTTP to create a new projectTiago Botelho2018-02-061-1/+20
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch '39550-group-labels-redesign' into 'master'Tim Zallmann2018-02-061-1/+1
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Change delete notice; update mobile stylesAnnabel Dunstone Gray2018-01-291-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-061-1/+14
| |_|/ / / / / |/| | | | | |
* | | | | | | Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-2/+2
* | | | | | | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | add the uploader context to the upload modelMicaël Bergeron2018-02-021-1/+1
* | | | | | | | Replace $.ajax in admin broadcast messages with axiosClement Ho2018-02-051-1/+4
View Lorry Controller Status