summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updates svg dependencyfl-updat-svg-dependencyFilipa Lacerda2018-03-082-4/+4
* Merge branch 'gitlab-git-duplicate-code' into 'master'Sean McGivern2018-03-081-18/+0
|\
| * Remove duplicate method definitionsJacob Vosmaer2018-03-081-18/+0
* | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-084-9/+46
|\ \
| * | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-074-9/+46
* | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-088-17/+6
|\ \ \
| * | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-088-17/+6
| | |/ | |/|
* | | Merge branch '43802-ensure-foreign-keys-on-clusters-applications' into 'master'Yorick Peterse2018-03-083-0/+57
|\ \ \
| * | | Ensure orphaned rows are deleted before adding the foreign key43802-ensure-foreign-keys-on-clusters-applicationsMayra Cabrera2018-03-072-2/+18
| * | | Ensure foreign keys on Clusters ApplicationsMayra Cabrera2018-03-073-0/+41
* | | | Merge branch 'ce-rubocop-naming-filename' into 'master'Nick Thomas2018-03-0828-147/+224
|\ \ \ \
| * | | | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-0828-147/+224
|/ / / /
* | | | Merge branch 'sh-add-missing-acts-as-taggable-indices' into 'master'Yorick Peterse2018-03-083-0/+28
|\ \ \ \
| * | | | Adding missing indexes on taggings tablesh-add-missing-acts-as-taggable-indicesStan Hu2018-03-073-0/+28
* | | | | Merge branch 'sh-add-section-name-index' into 'master'Yorick Peterse2018-03-083-1/+29
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add index on section_name_id on ci_build_trace_sections tablesh-add-section-name-indexStan Hu2018-03-083-1/+29
| |/ / /
* | | | Merge branch 'docs-exception-request-labels' into 'master'Sean McGivern2018-03-081-0/+3
|\ \ \ \
| * | | | Clarify that the Pick Into X.Y label is added after approvalSean McGivern2018-03-081-0/+3
* | | | | Merge branch 'sh-remove-double-caching-repo-empty' into 'master'Sean McGivern2018-03-083-5/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-emptyStan Hu2018-03-073-5/+10
* | | | | Merge branch 'patch-28' into 'master'Filipa Lacerda2018-03-081-1/+1
|\ \ \ \ \
| * | | | | Fix link to Merge Request CoachFabien Catteau2018-03-081-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '43770-change-clear-runners-cache-ujs-action-to-an-axios-request...Kamil Trzciński2018-03-088-51/+91
|\ \ \ \ \
| * | | | | 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-07120-920/+2712
| |\ \ \ \ \
| * | | | | | Removes UJS from reset cache buttonFilipa Lacerda2018-03-075-26/+73
| * | | | | | [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-07240-3048/+25824
| |\ \ \ \ \ \
| * \ \ \ \ \ \ [ci skip] Merge branch 'master' into 43770-change-clear-runners-cache-ujs-act...Filipa Lacerda2018-03-06670-13299/+11571
| |\ \ \ \ \ \ \
| * | | | | | | | Update Projects::Settings::CiCdController#reset_cache specsMatija Čupić2018-03-011-14/+5
| * | | | | | | | Make Projects::Settings:CiCdController#reset_cache a json endpointMatija Čupić2018-03-011-4/+6
* | | | | | | | | Merge branch 'fix-mattermost-delete-team' into 'master'Sean McGivern2018-03-084-3/+117
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add missing delete method in mattermost sessionjulien MILLAU2018-03-084-3/+117
|/ / / / / / / /
* | | | | | | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-0811-15/+98
|\ \ \ \ \ \ \ \
| * | | | | | | | Hides Triggers if integration only has one eventJames Edwards-Jones2018-03-084-2/+54
| * | | | | | | | Service integration displays validation errors on test failJames Edwards-Jones2018-03-073-13/+29
| * | | | | | | | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-075-0/+15
* | | | | | | | | Merge branch 'unassign-when-leaving' into 'master'Robert Speicher2018-03-087-116/+95
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leavingDouwe Maan2018-03-077-116/+95
* | | | | | | | | | Merge branch 'bvl-port-ee-improvements-from-maintainer-push' into 'master'Douwe Maan2018-03-086-18/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Validate `:push_code` before checking protected branchesbvl-port-ee-improvements-from-maintainer-pushBob Van Landuyt2018-03-081-6/+3
| * | | | | | | | | | Address frontend feedbackBob Van Landuyt2018-03-085-12/+29
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'Filipa Lacerda2018-03-076-32/+60
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-076-32/+60
* | | | | | | | | | | Merge branch 'da-update-project-activity' into 'master'Stan Hu2018-03-072-1/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update project activity when pushing to a wiki repositoryda-update-project-activityDouglas Barbosa Alexandre2018-03-072-1/+13
* | | | | | | | | | | | Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'Douwe Maan2018-03-0711-59/+194
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-07120-275/+1694
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-0711-94/+214
* | | | | | | | | | | | | | Merge branch 'docs-fe-typo' into 'master'Jacob Schatz2018-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix accessibility typodocs-fe-typoClement Ho2018-03-071-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |