summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '46010-add-more-validations-for-runners-and-runner-type' into 'm...Kamil Trzciński2018-06-012-6/+5
|\
| * Refactor validations and make runner factory by default to be instance-wide r...Kamil Trzciński2018-05-312-6/+5
* | Add validation to webhook and service URLs to ensure they are not blocked bec...Francisco Javier López2018-06-012-2/+2
|/
* 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-301-2/+21
|\
| * Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-2/+21
* | Merge branch '6045-extract-ee-specific-specs-lines' into 'master'Robert Speicher2018-05-298-37/+97
|\ \
| * | Reduce CE/EE diff in spec/controllers/projects/project_members_controller_spe...Rémy Coutable2018-05-241-1/+1
| * | Reduce CE/EE diff in spec/controllers/projects/issues_controller_spec.rbRémy Coutable2018-05-241-1/+1
| * | Reduce CE/EE diff in spec/controllers/projects/imports_controller_spec.rbRémy Coutable2018-05-241-12/+6
| * | Reduce CE/EE diff in spec/controllers/projects/group_links_controller_spec.rbRémy Coutable2018-05-241-0/+12
| * | Reduce CE/EE diff in spec/controllers/projects/environments_controller_spec.rbRémy Coutable2018-05-241-0/+7
| * | Reduce CE/EE diff in app/controllers/projects/clusters_controller.rbRémy Coutable2018-05-241-5/+4
| * | Reduce CE/EE diff in spec/controllers/projects/branches_controller_spec.rbRémy Coutable2018-05-241-0/+18
| * | Reduce CE/EE diff in spec/controllers/projects/boards_controller_spec.rbRémy Coutable2018-05-241-18/+48
| |/
* | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-257-74/+80
|\ \ | |/
| * Merge branch 'mr-conflict-notification' into 'master'Douwe Maan2018-05-242-2/+2
| |\
| | * Add cannot_be_merged_recheck merge_statuslulalala2018-05-172-2/+2
| * | Render 404 when prometheus adapter is disabled in Prometheus metrics controllerTiago Botelho2018-05-231-25/+48
| * | Exclude coverage data from the pipelines pageYorick Peterse2018-05-171-0/+6
| * | Limit the number of pipelines to countYorick Peterse2018-05-171-4/+4
| * | Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-171-28/+5
| |\ \
| | * | Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-28/+5
| | |/
| * | Allow group runners to be viewed/edited in APIDylan Griffith2018-05-161-3/+3
| |/
| * [Rails5] Fix spec/controllers/projects/jobs_controller_spec.rbb-rails5-fix-spec-controllers-projects-jobs_controller_spec-rbblackst0ne2018-05-111-12/+12
* | Merge remote-tracking branch 'origin/master' into 38759-fetch-available-param...Dennis Tang2018-05-116-111/+360
|\ \ | |/
| * Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-071-0/+72
| |\
| | * Backports every CE related change from ee-5484 to CETiago Botelho2018-05-071-0/+72
| * | Merge branch 'live-trace-v2' into 'master'Grzegorz Bizon2018-05-071-1/+2
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-071-0/+17
| | |\
| | * \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-033-33/+3
| | |\ \
| | * \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-241-1/+5
| | |\ \ \
| | * \ \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-231-4/+1
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-202-1/+28
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-172-4/+33
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-04-064-78/+175
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix HttpIO and specShinya Maeda2018-04-061-1/+2
| * | | | | | | | | Add signature verification badge to compare viewMarc2018-05-071-78/+232
| * | | | | | | | | Merge branch '33697-pipelines-json-endpoint' into 'master'Kamil Trzciński2018-05-071-2/+37
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into 33697-pipelines-json-endpointMatija Čupić2018-05-022-3/+3
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Align elements of the hash literal parameterMatija Čupić2018-05-021-4/+4
| | * | | | | | | | | Add stages_ajax endpoint to serve old HTMLKamil Trzciński2018-05-021-2/+37
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-033-33/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Load branches on new merge request page asynchronouslyWinnie Hellmann2018-05-021-30/+0
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Fix spec/features/admin/admin_runners_spec.rb + test style improvementsDylan Griffith2018-05-011-7/+13
| * | | | | | | | Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-241-1/+5
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | restrict projects ci controller to project runnersAlexis Reigel2018-04-231-0/+11
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Remove project billing context from controller specMatija Čupić2018-05-021-15/+7
* | | | | | | | Merge branch 'master' into 38759-fetch-available-parameters-directly-from-gke...Matija Čupić2018-05-024-14/+23
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Display and revoke active sessionsAlexis Reigel ( 🌴 may 2nd - may 9th 🌴 )2018-05-021-1/+1
View Lorry Controller Status