summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '33803-drop-json-support-in-project-milestone' into 'master'Rémy Coutable2018-03-281-2/+11
|\ | | | | | | | | | | | | Drop JSON support from Projects::MilestonesController#show Closes #33803 See merge request gitlab-org/gitlab-ce!17977
| * Drop JSON response in Project Milestone along with avoiding errorTakuya Noguchi2018-03-251-2/+11
| |
* | Merge branch '43603-ci-lint-support' into 'master'Kamil Trzciński2018-03-281-0/+123
|\ \ | | | | | | | | | | | | | | | | | | Resolve "/ci/lint should support include keyword in config file" Closes #43603 See merge request gitlab-org/gitlab-ce!17729
| * | Make ci/lint page context aware:Mayra Cabrera2018-03-261-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Create ci/lints controller inside project/ - Move js pages to be inside projects/ - Copy view ci/lint view to be inside project folder - Remove ci/lint view and js files Closes #43603
* | | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-271-0/+97
|\ \ \ | | | | | | | | | | | | | | | | Add protected branch policy See merge request gitlab-org/gitlab-ce!17982
| * | | ProtectedBranchPolicy used from Controller for destroy/updateJames Edwards-Jones2018-03-261-0/+41
| | | |
| * | | DestroyService for protected tags/branches used from controllerJames Edwards-Jones2018-03-261-0/+56
| | |/ | |/|
* | | Merge branch '5347-fix-multiple-clusters-incorrect-details-injected' into ↵Kamil Trzciński2018-03-271-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Port to CE: Resolve "Multiple clusters: incorrect cluster details injected - environment scope is ignored" See merge request gitlab-org/gitlab-ce!17904
| * | | Rearrange DeploymentPlatform methodsMayra Cabrera2018-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change find_cluster_platform_kubernetes to ignore environment argument - Fix broken specs CE Port of: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5047/
* | | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-273-26/+107
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358
| * | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0811-28/+167
| |\ \ \ | | |/ /
| * | | fix specsMicaël Bergeron2018-03-071-1/+0
| | | |
| * | | fix some broken specsMicaël Bergeron2018-03-061-0/+1
| | | |
| * | | another round of EE code removalMicaël Bergeron2018-03-021-6/+57
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backportKamil Trzciński2018-02-285-11/+120
| |\ \ \ | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵Kamil Trzciński2018-02-282-44/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-288-44/+133
| |\ \ \ \ \
| | * | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-282-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
| * | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master'Kamil Trzciński2018-02-281-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE: Trace as artifacts (FileStorage and ObjectStorage) Closes #4171 See merge request gitlab-org/gitlab-ee!4258
| * | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-282-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867
| * | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵Kamil Trzciński2018-02-2843-129/+381
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * | | | | | | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple artifacts ee See merge request gitlab-org/gitlab-ee!3276
| * | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵Kamil Trzciński2018-02-2812-482/+620
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵Kamil Trzciński2018-02-2847-508/+909
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵Kamil Trzciński2018-02-2813-250/+828
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master'Douwe Maan2018-02-282-30/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can migrate LFS objects to S3 style object storage Closes #2841 See merge request !2760
* | | | | | | | | | | Merge branch ↵Kamil Trzciński2018-03-261-8/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-name' into 'master' Resolve "Controller parameters handling sensitive information should use a more specific name" Closes #43316 See merge request gitlab-org/gitlab-ce!17796
| * | | | | | | | | | Make Variable key not secret43316-controller-parameters-handling-sensitive-information-should-use-a-more-specific-nameMatija Čupić2018-03-221-9/+9
| | | | | | | | | | |
| * | | | | | | | | | Use secret_key and secret_value in Pipeline Schedule variablesMatija Čupić2018-03-171-8/+10
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pages_force_https' into 'master'Nick Thomas2018-03-232-2/+39
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTPS only Pages Closes #28857 See merge request gitlab-org/gitlab-ce!16273
| * | | | | | | | | | Add HTTPS-only pagesRob Watson2018-03-222-2/+39
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #28857
* | | | | | | | | | Use actual repo instead of stubbing method43482-enabling-auto-devops-on-an-empty-project-gives-you-wrong-informationMatija Čupić2018-03-221-7/+1
| | | | | | | | | |
* | | | | | | | | | Add empty repo check before running AutoDevOps pipelineMatija Čupić2018-03-111-3/+31
|/ / / / / / / / /
* | | | | | | | | Merge branch ↵Kamil Trzciński2018-03-081-14/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43770-change-clear-runners-cache-ujs-action-to-an-axios-request' into 'master' Resolve "Change Clear Runners cache UJS action to an API request" Closes #43770 See merge request gitlab-org/gitlab-ce!17466
| * \ \ \ \ \ \ \ \ [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-071-4/+2
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (68 commits) Upgrade Workhorse to 4.0.0 naming things Update GitLab Pages to v0.7.0 Minor fixes in API doc Use Project#full_name instead of name_with_namespace Fix tests not completely disabling Gitaly Move OperationService#UserRemoveBranch Move OperationService#UserCreateBranch Move CommitService#Languages to OPT_OUT Move RefService#CreateBranch to OPT_OUT Move RefService#DeleteBranch to OPT_OUT Move OperationService#UserRevert to OPT_OUT Move OperationService#UserAddTag to OPT_OUT Move CommitService::CommitPatch to OPT_OUT Change to Pacific Time Zone Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5' Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5' Remove wrong assumption about Runners cache GC Add CommonMark markdown engine add nginx_status monitoring details ...
| * \ \ \ \ \ \ \ \ \ [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-073-8/+54
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (97 commits) Remove common_vue bundle Gitlab::Utils - backport `.ensure_array_from_string` from EE Fix false positive spec of using digest instead of hexdigest Change queue namespace of UpdateHeadPipelineForMergeRequestWorker prefer checking explicitly for null replace fixture with simple mount point add new tests for metrics dashboard changes Set sha256 checksum when archiving traces Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace Docs guidelines: cherry-picking commits from CE to EE CI charts now include the current day New .dedicated-no-docs-pull-cache-job and .no-db-job definitions Add date calls in .gitlab-ci.yml to see how long each step take move misplaced entry point Arg.id via method pointer Backport description composition from EE Fix a typo, a conflict and improve documentation Remove extra breadcrumb on tags Lazy fetch parent commits for a commit Fix Gitaly n+1 in NetworkController#show ...
| * \ \ \ \ \ \ \ \ \ \ [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-062-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (163 commits) Resolve "Group Leave action is broken on Groups Dashboard and Homepage" So that it's consistent with other entries and EE Fix race condition when previewing docs Resolve "Enable privileged mode for Runner installed on Kubernetes" Change column to file_sha256. Add test. Add changelog Add checksum at runner grape api Revert logic of calculating checksum Add post migration for checksum calculation Add ObjectStorageQueue concern and test Import use_file method from EE and use it for calculation of checksum Change column type to binary from string Add checksum to ci_job_artifacts Make oauth provider login generic Don't error out in system hook if user has `nil` datetime columns Use host URL to build JIRA remote link icon CI/CD-only projects FE Resolve "SSH key add text" Changes after review Projects and groups badges API Remove default scope from todos ...
| * | | | | | | | | | | | Update Projects::Settings::CiCdController#reset_cache specsMatija Čupić2018-03-011-14/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-081-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
| * | | | | | | | | | | | Service integration displays validation errors on test failJames Edwards-Jones2018-03-071-0/+12
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes attempts to update a service integration which had `can_test?` set to true but validations were causing the "Test and save changes" button to return "Something went wrong on our end." Removes references to index action left from 0af99433143727088b6a0a1b2163751c05d80ce6
* | | | | | | | | | | | Merge branch 'jivl-new-modal-project-labels-milestones' into 'master'Filipa Lacerda2018-03-071-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve: Modal and banner designs for project label and project milestone promotion Closes #41895 See merge request gitlab-org/gitlab-ce!17197
| * | | | | | | | | | | used respond_to formats for persisting flash messages insteadjivl-new-modal-project-labels-milestonesJose Ivan Vargas2018-03-062-2/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Add persistent flash messagesJose Ivan Vargas2018-03-012-4/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Added vue based promotion modals for labels and milestonesJose Ivan Vargas2018-03-011-1/+0
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵5029-support-cluster-metrics-cePawel Chojnacki2018-03-066-2/+127
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5029-support-cluster-metrics-ce # Conflicts: # spec/models/clusters/applications/prometheus_spec.rb
| * \ \ \ \ \ \ \ \ \ \ Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵Rémy Coutable2018-03-061-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
| | * | | | | | | | | | Add overview of branches and a filter for active/stale branchesTakuya Noguchi2018-03-061-0/+33
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch '41777-include-cycle-time-in-usage-ping' into 'master'Douwe Maan2018-03-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793
| | * | | | | | | | | | | Adapt cycle analytics spec helper and cycle analytics usage data spec41777-include-cycle-time-in-usage-pingTiago Botelho2018-03-011-1/+1
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'Kamil Trzciński2018-03-011-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display ingress IP address in the Kubernetes page See merge request gitlab-org/gitlab-ce!17052