summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-0964-6/+75
|
* Merge branch 'move-project-fork-to-rspec' into 'master'Douwe Maan2018-03-091-0/+104
|\ | | | | | | | | Move project fork spinach tests to RSpec See merge request gitlab-org/gitlab-ce!17511
| * Move project fork spinach tests to RSpecSemyon Pupkov2018-03-051-0/+104
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | Merge branch 'project-active-tab-rspec' into 'master'Douwe Maan2018-03-091-0/+137
|\ \ | | | | | | | | | | | | Move project active tab spinach tests to RSpec See merge request gitlab-org/gitlab-ce!17628
| * | Move project active tab spinach tests to RSpecSemyon Pupkov2018-03-081-0/+137
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | Add rake task to cleanup any existing exclusive leaseGabriel Mazetto2018-03-091-0/+12
| | |
* | | Merge branch 'jprovazn-commits-count-reschedule' into 'master'Yorick Peterse2018-03-092-0/+49
|\ \ \ | | | | | | | | | | | | | | | | Reschedule commits_count background migration See merge request gitlab-org/gitlab-ce!17599
| * | | Reschedule commits_count background migrationjprovazn-commits-count-rescheduleJan Provaznik2018-03-092-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still have >100K unmigrated MergeRequestDiffs which don't have commits_count set yet (see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17567#note_61904891) This migration re-schedules the original background migration. To assure that records are not processed twice, records with commits_count set are skipped. Related to #41698 and !17567
* | | | Merge branch 'merge-request-widget-source-branch-improvements' into 'master'Filipa Lacerda2018-03-093-9/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont show remove source branch checkbox when user cannot remove the branch Closes #33264 See merge request gitlab-org/gitlab-ce!17642
| * | | | use toEqual instead of toBeFalsy/TruthyPhil Hughes2018-03-091-3/+3
| | | | |
| * | | | added rspec test to test when user cant mergemerge-request-widget-source-branch-improvementsPhil Hughes2018-03-081-0/+24
| | | | |
| * | | | Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-083-9/+46
| | | | | | | | | | | | | | | | | | | | Closes #33264
* | | | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-095-103/+158
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache `#can_be_resolved_in_ui?` git operations Closes gitaly#1051 See merge request gitlab-org/gitlab-ce!17589
| * | | | | Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-082-2/+48
| | | | | |
| * | | | | Refactor RepositoryCache to make it usable in other classesAlejandro Rodríguez2018-03-063-76/+85
| | | | | |
* | | | | | Merge branch '43949-verify-job-artifacts' into 'master'Sean McGivern2018-03-093-0/+75
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Foreground verification of job artifacts" Closes #43949 See merge request gitlab-org/gitlab-ce!17578
| * | | | | Implement foreground verification of CI artifacts43949-verify-job-artifactsNick Thomas2018-03-073-0/+75
| | | | | |
* | | | | | Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' ↵Phil Hughes2018-03-082-38/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Move MemoryGraph and MemoryUsage vue components See merge request gitlab-org/gitlab-ce!17533
| * | | | | | Move MemoryGraph and MemoryUsage vue componentsGeorge Tsiolis2018-03-082-38/+6
| | | | | | |
* | | | | | | Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes2018-03-081-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix delete milestone button showing up for all users Closes #43778 See merge request gitlab-org/gitlab-ce!17576
| * | | | | | | Fix milestone delete button showing for all usersjivl-fix-delete-milestone-button-showing-upJose Ivan Vargas2018-03-061-0/+11
| | | | | | | |
* | | | | | | | Fix Error 500 when updating a projectsh-fix-update-serviceStan Hu2018-03-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no parameters were specified for project features but Wikis were disabled, we would get "NoMethodError: undefined method `[]' for nil:NilClass". Closes #44019
* | | | | | | | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-081-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve database response time for listing user activity Closes #40525 See merge request gitlab-org/gitlab-ce!17454
| * | | | | | | | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #40525.
* | | | | | | | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-081-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Cleanup after adding MR diff's commit_count" See merge request gitlab-org/gitlab-ce!17639
| * | | | | | | | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
* | | | | | | | | | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-084-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern2018-03-081-2/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove double caching of Repository#empty? Closes #43882 See merge request gitlab-org/gitlab-ce!17588
| * | | | | | | | | Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-emptyStan Hu2018-03-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We saw that in a customer instance, `empty?` was cached to be `true` even though `has_visible_content?` and `exists?` were `true`. This double caching can run into edge cases because there's no guarantee that the inner values will properly expire the outer one, especially if there is Redis replication lag. Consider this scenario: 1. `exists?` and `has_visible_content?` are false 2. `empty?` is expired 3. A subsequent call to `empty?` returns `true` because `exists?` is false even though `empty` is true 4. `exists?` and `has_visible_content?` are then expired 5. `exists?` and `has_visible_content?` are set to true 6. `empty?` is still stuck in the wrong value as `true` Closes #43882
* | | | | | | | | | Merge branch ↵Kamil Trzciński2018-03-084-37/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | | | | Fix broken tests43770-change-clear-runners-cache-ujs-action-to-an-axios-requestFilipa Lacerda2018-03-072-9/+9
| | | | | | | | | | |
| * | | | | | | | | | [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-0720-545/+819
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | | | | | | | Removes UJS from reset cache buttonFilipa Lacerda2018-03-072-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses loading button for better UX
| * | | | | | | | | | [ci skip] Merge branch 'master' into ↵Filipa Lacerda2018-03-0776-801/+2184
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06237-6316/+4976
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add missing delete method in mattermost sessionjulien MILLAU2018-03-081-0/+104
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-083-0/+48
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
| * | | | | | | | | | | | Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-081-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes confusing/unnecessary checkboxes when trying to configure an integration. If there is only one supported event we don't need to allow these to be individually disabled since the integration can be disabled instead. E.g. Project Integrations for GitHub, Bugzilla, Asana, Pipeline emails and Gemnasium Allows integrations to override which triggers are configurable
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds detailed_status to pipeline hook data Adds detailed_description option for Services Integration edit page renders 404 if a service is disabled
* | | | | | | | | | | | | Merge branch 'unassign-when-leaving' into 'master'Robert Speicher2018-03-082-59/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't delete todos or unassign issues and MRs when a user leaves a project Closes #43899 See merge request gitlab-org/gitlab-ce!17615
| * | | | | | | | | | | | | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-072-59/+60
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Address frontend feedbackBob Van Landuyt2018-03-081-8/+25
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backport of custom metrics for the common metrics section of CE See merge request gitlab-org/gitlab-ce!17586
| * | | | | | | | | | | | | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-071-1/+1
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'da-update-project-activity' into 'master'Stan Hu2018-03-071-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project activity when pushing to a wiki repository See merge request gitlab-org/gitlab-ce!17621
| * | | | | | | | | | | | | | Update project activity when pushing to a wiki repositoryda-update-project-activityDouglas Barbosa Alexandre2018-03-071-0/+12
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-072-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create CI/CD-only projects from GitHub -- CE backport See merge request gitlab-org/gitlab-ce!17432
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-0723-35/+672
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot