summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '46010-add-more-validations-for-runners-and-runner-type' into 'm...Kamil Trzciński2018-06-011-2/+1
|\
| * Improve `Ci::Runner#assign_to` to return a flag whether it succeeded or notKamil Trzciński2018-05-311-2/+1
* | Add validation to webhook and service URLs to ensure they are not blocked bec...Francisco Javier López2018-06-011-3/+3
* | Merge branch '46487-add-support-for-jupyter-in-gitlab-via-kubernetes' into 'm...Dmitriy Zaporozhets2018-06-011-1/+22
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 46487-add-support-for-jupyt...Dmitriy Zaporozhets2018-05-306-47/+21
| |\ \
| * | | Fix exception in clusters/applications_controller.rbDmitriy Zaporozhets2018-05-301-1/+1
| * | | Refactor cluster app creation code in controllerDmitriy Zaporozhets2018-05-301-4/+5
| * | | Add oauth reference to jupyter cluster appDmitriy Zaporozhets2018-05-251-1/+20
| * | | Add support for Jupyter in GitLab via KubernetesDmitriy Zaporozhets2018-05-251-0/+1
* | | | Export assigned issues in iCalendar feedImre Farkas2018-05-311-2/+13
| |_|/ |/| |
* | | Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-2/+2
| |/ |/|
* | Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-302-2/+3
|\ \
| * | Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-292-2/+3
| |/
* | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-292-13/+10
|\ \
| * | Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rbRémy Coutable2018-05-241-0/+10
| * | Reduce CE/EE diff in app/controllers/projects/clusters_controller.rbRémy Coutable2018-05-241-13/+0
* | | Merge branch '38759-fetch-available-parameters-directly-from-gke-when-creatin...Kamil Trzciński2018-05-291-29/+3
|\ \ \
| * | | Move token_in_session to helper methodMatija Čupić2018-05-281-2/+2
| * | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-259-39/+44
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-118-40/+163
| |\ \ \
| * \ \ \ Merge branch 'master' into 38759-fetch-available-parameters-directly-from-gke...Matija Čupić2018-05-024-8/+3
| |\ \ \ \
| * | | | | Remove list_projects action from Google API checkMatija Čupić2018-05-021-1/+1
| * | | | | Remove Projects::Clusters::GcpController#list_projectsMatija Čupić2018-05-021-16/+0
| * | | | | Use ListGcpProjectsWorker#read_projects instead of get_projectsMatija Čupić2018-04-231-1/+1
| * | | | | Remove the GCP billing verification stepMatija Čupić2018-04-201-17/+1
| * | | | | Store projects in ListGcpProjectsWorkerMatija Čupić2018-04-201-10/+9
| * | | | | Rename CheckGcpProjectBillingWorker to ListGcpProjectsWorkerMatija Čupić2018-04-201-3/+3
| * | | | | Merge branch 'master' into 38759-fetch-available-parameters-directly-from-gke...Matija Čupić2018-04-2035-145/+315
| |\ \ \ \ \
| * | | | | | Expose CloudPlatform::Client#projects_list as GcpController#list_projects38759-fetch-available-parameters-directly-from-gke-when-creating-a-clusterMatija Čupić2018-03-161-1/+8
* | | | | | | Add helpful messages to empty wiki viewPaul Slaughter2018-05-291-3/+5
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'dz-refactor-cluster-apps-schedule' into 'master'Douwe Maan2018-05-241-3/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Refactor code around scheduling cluster installationsdz-refactor-cluster-apps-scheduleDmitriy Zaporozhets2018-05-241-3/+4
* | | | | | Render 404 when prometheus adapter is disabled in Prometheus metrics controllerTiago Botelho2018-05-231-1/+1
* | | | | | CE backport - Allow viewing only one board when multiple issue boards is not ...ce_backport_issue_5128Felipe Artur2018-05-221-3/+6
* | | | | | Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into '...Douwe Maan2018-05-221-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed badge api endpoint route when relative_url is setfj-46411-fix-badge-api-endpoint-route-with-relative-urlFrancisco Javier López2018-05-171-2/+2
* | | | | | Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-171-1/+8
|\ \ \ \ \ \
| * | | | | | Backport changes from EE to minimize the CE/EE diff in Projects::Settings::In...6020-extract-ee-specific-controller-linesRémy Coutable2018-05-161-1/+8
| |/ / / / /
* | | | | | Exclude coverage data from the pipelines pageYorick Peterse2018-05-171-1/+1
* | | | | | Preload pipeline data for project pipelinesYorick Peterse2018-05-171-1/+1
* | | | | | Limit the number of pipelines to countYorick Peterse2018-05-171-11/+10
* | | | | | Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-171-2/+6
|\ \ \ \ \ \
| * | | | | | Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-2/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Rename User#ci_authorized_runners -> ci_owned_runnersDylan Griffith2018-05-161-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-151-13/+0
|\ \ \ \ \
| * | | | | Clean up `notes_controller`blackst0ne2018-05-141-13/+0
| |/ / / /
* | | | | Enable update_(build|pipeline) for maintainersJan Provaznik2018-05-151-0/+4
|/ / / /
* | | | Merge branch 'fix-failed-jobs-tab' into 'master'Grzegorz Bizon2018-05-081-1/+1
|\ \ \ \
| * | | | Respect permissions when showing Failed JobsKamil Trzciński2018-05-061-1/+1
* | | | | Merge branch '10244-ux-improvements-for-group-runners' into 'master'Kamil Trzciński2018-05-072-10/+11
|\ \ \ \ \
View Lorry Controller Status