summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)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 RSpecSemyon Pupkov2018-03-051-0/+104
* | Merge branch 'project-active-tab-rspec' into 'master'Douwe Maan2018-03-091-0/+137
|\ \
| * | Move project active tab spinach tests to RSpecSemyon Pupkov2018-03-081-0/+137
* | | 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 migrationjprovazn-commits-count-rescheduleJan Provaznik2018-03-092-0/+49
* | | | Merge branch 'merge-request-widget-source-branch-improvements' into 'master'Filipa Lacerda2018-03-093-9/+70
|\ \ \ \
| * | | | 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
* | | | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-095-103/+158
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | 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' into...Phil Hughes2018-03-082-38/+6
|\ \ \ \ \ \
| * | | | | | 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 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
* | | | | | | | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-081-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-071-1/+0
* | | | | | | | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-081-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-081-0/+0
* | | | | | | | | | [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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-emptyStan Hu2018-03-071-2/+0
* | | | | | | | | | Merge branch '43770-change-clear-runners-cache-ujs-action-to-an-axios-request...Kamil Trzciński2018-03-084-37/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix broken tests43770-change-clear-runners-cache-ujs-action-to-an-axios-requestFilipa Lacerda2018-03-072-9/+9
| * | | | | | | | | | [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-0720-545/+819
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Removes UJS from reset cache buttonFilipa Lacerda2018-03-072-16/+29
| * | | | | | | | | | [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-0776-801/+2184
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-06237-6316/+4976
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-081-0/+35
| * | | | | | | | | | | | Service integration displays validation errors on test failJames Edwards-Jones2018-03-071-0/+12
| * | | | | | | | | | | | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-071-0/+1
* | | | | | | | | | | | | 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 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 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 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /