summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Rephrase "maintainer" to more precise "members who can merge to the target br...42751-rename-mr-maintainer-pushMark Chao2018-06-011-1/+1
* Update 404 and 403 pagesPaul Slaughter2018-05-311-4/+5
* Export assigned issues in iCalendar feedImre Farkas2018-05-313-6/+30
* Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-schedulingOswaldo Ferreira2018-05-301-2/+2
* Merge branch 'bvl-group-shared-projects-private-api' into 'master'Sean McGivern2018-05-301-0/+31
|\
| * Fix small typosToon Claes2018-05-291-1/+1
| * Add `shared_projects` endpointBob Van Landuyt2018-05-291-0/+31
* | 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 remote-tracking branch 'dev/master'Mayra Cabrera2018-05-291-2/+0
|\ \ \ \
| * \ \ \ Merge branch 'security-users-can-update-their-password-without-entering-curre...Mayra Cabrera2018-05-291-2/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove password and password_confirmation from whitelisted params in Profiles...Tiago Botelho2018-05-071-2/+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-2521-52/+94
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-1124-77/+404
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 38759-fetch-available-parameters-directly-from-gke...Matija Čupić2018-05-0211-97/+117
| |\ \ \ \ \ \
| * | | | | | | 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-2067-237/+518
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Fix fast admin counters not working when PostgreSQL has secondariessh-fix-admin-page-counts-take-2Stan Hu2018-05-251-0/+4
| |_|_|_|/ / / |/| | | | | |
* | | | | | | 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
* | | | | | | Merge branch 'ce-jej/saml-failure-messages' into 'master'Grzegorz Bizon2018-05-241-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Backport helpers from GroupSAML failure messagesce-jej/saml-failure-messagesJames Edwards-Jones2018-05-211-2/+2
| |/ / / / / /
* | | | | | | Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-...Douwe Maan2018-05-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use ApplicationSetting.current_without_cache instead of ApplicationSetting.cu...Rémy Coutable2018-05-231-1/+1
* | | | | | | | 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-222-6/+14
* | | | | | | Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into '...Douwe Maan2018-05-222-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed badge api endpoint route when relative_url is setfj-46411-fix-badge-api-endpoint-route-with-relative-urlFrancisco Javier López2018-05-172-4/+4
* | | | | | | Merge branch '6020-extract-ee-specific-controller-lines' into 'master'Robert Speicher2018-05-173-3/+10
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | Introduce a new Keys::DestroyService serviceRémy Coutable2018-05-161-1/+1
| * | | | | | | Add :weight as an allowed serializable field in app/controllers/boards/issues...Rémy Coutable2018-05-161-1/+1
* | | | | | | | 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
* | | | | | | | Resolve "Opening Project with invite but without accepting leads to 404 error...🙈 jacopo beschi 🙉2018-05-173-1/+22
* | | | | | | | 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
View Lorry Controller Status