summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-131-1/+1
* Merge branch 'recaptcha_check_if_spammable_ce_backport' into 'master'Sean McGivern2017-12-131-2/+8
* Merge branch '29483-no-feedback-when-checking-on-checklist-if-potential-spam-...Sean McGivern2017-12-132-4/+15
* Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-082-2/+11
* Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-081-1/+3
|\
| * Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-071-1/+3
* | Merge branch '40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-d...Kamil Trzciński2017-12-071-1/+0
|\ \
| * | Remove Auto DevOps checkboxes - backendbikebilly2017-12-041-1/+0
| |/
* | add support for the commit reference filtermicael.bergeron2017-12-072-13/+3
* | tidying up the changesmicael.bergeron2017-12-071-3/+0
* | add support for commit (in mr) to reference filtermicael.bergeron2017-12-071-1/+10
* | corrects the url buildingmicael.bergeron2017-12-072-6/+8
* | diff notes created in merge request on a commit have the right contextmicael.bergeron2017-12-072-8/+7
* | Allow commenting on individual commits inside an MRDouwe Maan2017-12-072-14/+44
* | Support uploads for groupsJarka Kadlecova2017-12-073-23/+63
* | Resolve "Display member role per project"Mike Greiling2017-12-074-9/+45
* | Merge branch '22680-unlabel-slash-command-limit-autocomplete-to-applied-label...Tim Zallmann2017-12-061-8/+8
|\ \
| * | Limit autocomplete menu to applied labelsVitaliy @blackst0ne Klachkov2017-11-281-8/+8
* | | Merge branch '39364-in-issue-board-url-doesn-t-take-in-account-hostname-setti...Sean McGivern2017-12-061-1/+1
|\ \ \
| * | | Use path helper instead of url helperLuke Bennett2017-12-031-1/+1
| | |/ | |/|
* | | Merge branch 'list-multiple-clusters' into 'master'Grzegorz Bizon2017-12-061-8/+31
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into list-multiple-clustersMatija Čupić2017-12-051-3/+3
| |\ \ \
| * | | | Use ClustersFinder for setting countsMatija Čupić2017-12-051-4/+3
| * | | | Merge remote-tracking branch 'origin/master' into list-multiple-clustersKamil Trzcinski2017-12-051-2/+2
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-051-1/+1
| |\ \ \ \ \
| | * | | | | Remove references of project.cluster from specsMatija Čupić2017-12-041-1/+1
| | * | | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-12-047-13/+22
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| * | | | | | Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clus...Kamil Trzcinski2017-12-052-3/+4
| |\ \ \ \ \ \
| | * | | | | | Use find instead of find_by!Shinya Maeda2017-12-051-1/+1
| | * | | | | | Optimize Projects::ClustersController#clusterShinya Maeda2017-12-041-1/+2
| | * | | | | | Use status polling definitinoShinya Maeda2017-12-041-1/+1
| | * | | | | | Optimize Clusters::CreateService#executeShinya Maeda2017-12-041-1/+1
| * | | | | | | Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-031-9/+33
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | Refactor ClustersController pagination testMatija Čupić2017-12-011-1/+1
| | * | | | | Use strings for @scope in ClustersController#indexMatija Čupić2017-11-301-1/+1
| | * | | | | Default to :all scope for ClustersController#indexMatija Čupić2017-11-291-1/+1
| | * | | | | Move cluster sourcing from before_action to #indexMatija Čupić2017-11-281-8/+2
| | * | | | | Expose scope to view in ClustersController#indexMatija Čupić2017-11-281-0/+1
| | * | | | | Changes after Frontend and UX review:Filipa Lacerda2017-11-281-1/+2
| | * | | | | Fix symbolization error in #clustersMatija Čupić2017-11-271-1/+1
| | * | | | | Use current_user in ClustersController#clustersMatija Čupić2017-11-271-1/+1
| | * | | | | Add cluster pagination to ClustersController#indexMatija Čupić2017-11-271-0/+1
| | * | | | | Use ClustersFinder in ClustersController#clustersMatija Čupić2017-11-271-2/+6
| | * | | | | Add cluster counts to ClustersController#indexMatija Čupić2017-11-271-1/+3
| | * | | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-11-271-5/+5
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Handle toggle button with API requestFilipa Lacerda2017-11-241-0/+2
| | * | | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-11-2410-25/+19
| | |\ \ \ \ \
| | * | | | | | Adds JS to toggle buttons [ci skip]Filipa Lacerda2017-11-241-4/+14
| | * | | | | | Merge branch 'master' into list-multiple-clustersFilipa Lacerda2017-11-2220-43/+49
| | |\ \ \ \ \ \
| | * | | | | | | Move cluster loading to ClustersController#indexMatija Čupić2017-11-161-5/+1