summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architectureRémy Coutable2017-11-248-39/+58
* Merge branch '40465-update-timeago-js' into 'master'Filipa Lacerda2017-11-242-4/+14
|\
| * Updated timeago.jsTim Zallmann2017-11-242-4/+14
* | Merge branch 'issue_40374' into 'master'Sean McGivern2017-11-248-40/+95
|\ \ | |/ |/|
| * Fix WIP system note not being createdissue_40374Felipe Artur2017-11-238-40/+95
* | Merge branch '36400-trigger-job' into 'master'Tim Zallmann2017-11-243-3/+34
|\ \
| * | Prevent 500 error when inspecting job after trigger was removedFilipa Lacerda2017-11-243-3/+34
|/ /
* | Merge branch '38916-add-classlist-polyfill' into 'master'Filipa Lacerda2017-11-243-270/+60
|\ \
| * | Add classList polyfill for IE classList.toggle(.., force)38916-add-classlist-polyfillEric Eastwood2017-11-243-270/+60
* | | Merge branch 'dm-fix-registry-with-sudo-token' into 'master'Sean McGivern2017-11-243-16/+16
|\ \ \
| * | | Fix pulling and pushing using a personal access token with the sudo scopedm-fix-registry-with-sudo-tokenDouwe Maan2017-11-233-16/+16
* | | | Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'Douwe Maan2017-11-248-46/+83
|\ \ \ \ | |_|/ / |/| | |
| * | | Use feature flag instead of application settigns to control if method calls s...pawel/update_prometheus_gem_to_well_tested_versionPawel Chojnacki2017-11-237-38/+7
| * | | Rename wip to worker_idPawel Chojnacki2017-11-231-3/+3
| * | | add missing schema entry and application settigns helperPawel Chojnacki2017-11-232-1/+3
| * | | Use only real duration to measure method call performance via PrometheusPawel Chojnacki2017-11-233-35/+15
| * | | check method timing threshold when observing method performancePawel Chojnacki2017-11-232-10/+59
| * | | Add changelog for #15558Pawel Chojnacki2017-11-231-0/+5
| * | | Reenable prometheus metricsPawel Chojnacki2017-11-231-3/+3
| * | | Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-238-11/+43
| * | | Update prometheus-client-gem to 0.7.0.beta33Pawel Chojnacki2017-11-232-5/+5
* | | | Update CHANGELOG.md for 10.2.2Michael Kozono2017-11-2311-50/+22
* | | | Merge branch 'fix/import-uploads-hashed-storage' into 'master'Nick Thomas2017-11-234-2/+122
|\ \ \ \
| * | | | Fix hashed storage for attachments bugsJames Lopez2017-11-234-2/+122
|/ / / /
* | | | Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'Sean McGivern2017-11-239-118/+77
|\ \ \ \
| * | | | Rename fetch_refs to refmapDouwe Maan2017-11-237-28/+29
| * | | | Clean up repository fetch and mirror methodsDouwe Maan2017-11-239-115/+73
| | |/ / | |/| |
* | | | Merge branch 'fix-mermaid-import' into 'master'Filipa Lacerda2017-11-235-58/+50
|\ \ \ \
| * | | | moved to es6 modulesfix-mermaid-importPhil Hughes2017-11-224-50/+45
| * | | | Fixed import of render mermaid & render math methodsPhil Hughes2017-11-222-12/+9
* | | | | Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master'Rémy Coutable2017-11-233-6/+6
|\ \ \ \ \
| * | | | | Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateServicejej-rename-legacy-protected-branches-api-serviceJames Edwards-Jones2017-11-233-6/+6
* | | | | | Merge branch 'simplify-db-changes-template' into 'master'Rémy Coutable2017-11-231-37/+9
|\ \ \ \ \ \
| * | | | | | Simplify the DB changes checklistsimplify-db-changes-templateYorick Peterse2017-11-231-37/+9
* | | | | | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-237-32/+32
|\ \ \ \ \ \ \
| * | | | | | | Make sure we're using git installed in gitlab-build-images39887-move-identical-check-to-merged-branchesLin Jen-Shin2017-11-231-0/+1
| * | | | | | | Make sure repository is restoredLin Jen-Shin2017-11-231-0/+4
| * | | | | | | Move identical merged branch check to merged_branch_namesLin Jen-Shin2017-11-236-32/+27
* | | | | | | | Merge branch 'reviewing-db-changes' into 'master'Rémy Coutable2017-11-2313-0/+104
|\ \ \ \ \ \ \ \
| * | | | | | | | Added Rubocop config for background migrationsreviewing-db-changesYorick Peterse2017-11-2313-0/+104
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'use-merge-requests-diff-id-column' into 'master'Douwe Maan2017-11-2315-8/+197
|\ \ \ \ \ \ \ \
| * | | | | | | | Use latest_merge_request_diff associationSean McGivern2017-11-2315-8/+197
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk-group-mentions-fix' into 'master'Sean McGivern2017-11-2315-36/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix link text from group contextJarka Kadlecova2017-11-2315-36/+51
* | | | | | | | | Merge branch 'feature/disable-password-authentication' into 'master'Douwe Maan2017-11-2352-110/+299
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow password authentication to be disabled entirelyMarkus Koller2017-11-2352-110/+299
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix/sm/40478-gcp_clusters_migration_culprit' into 'master'Kamil Trzciński2017-11-231-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove cluster_id from 20171013104327_migrate_gcp_clusters_to_new_clusters_ar...Shinya Maeda2017-11-231-1/+0
* | | | | | | | | | Merge branch 'docs/cross-link-default-branch' into 'master'Marcia Ramos2017-11-231-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cross link default branch docs to issue closing pattern docsdocs/cross-link-default-branchAchilleas Pipinellis2017-11-221-2/+3