summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* static-analysis fix40352-ignore-hashed-repos-cleanup-dirsdigitalMoksha2017-11-251-2/+1
|
* refactored the hashed repository namedigitalMoksha2017-11-251-2/+5
|
* static analysis fixdigitalMoksha2017-11-241-1/+0
|
* added changelogdigitalMoksha2017-11-242-0/+10
|
* ignore hashed repositories when doing rake gitlab:cleanup:dirsdigitalMoksha2017-11-242-11/+39
|
* Merge branch 'jej/fix-protected-branch-validations-ce' into 'master'Rémy Coutable2017-11-248-42/+34
|\ | | | | | | | | Fix ProtectedBranch access level validations See merge request gitlab-org/gitlab-ce!15586
| * Deduplicate protected ref human_access_levelsjej/fix-protected-branch-validations-ceJames Edwards-Jones2017-11-246-25/+15
| | | | | | | | | | | | Previously these were duplicated so they could be different for push/merge, but this was no longer necessary after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11232
| * Fix ProtectedBranch access level validationsJames Edwards-Jones2017-11-245-17/+19
| | | | | | | | | | Before an access_level was required in EE even when an it had been set for a user/group.
* | Merge branch 'dm-project-search-performance' into 'master'Sean McGivern2017-11-246-44/+18
|\ \ | | | | | | | | | | | | | | | | | | Drastically improve project search performance by no longer searching namespace name Closes #40510 and #39623 See merge request gitlab-org/gitlab-ce!15590
| * | Drastically improve project search performance by no longer searching ↵dm-project-search-performanceDouwe Maan2017-11-246-44/+18
| | | | | | | | | | | | namespace name
* | | Merge branch 'qa/gb/add-feedback-to-package-qa-action' into 'master'Rémy Coutable2017-11-242-20/+91
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a feedback mechanism to `package-qa` manual action Closes #40431 See merge request gitlab-org/gitlab-ce!15538
| * | | Add a feedback mechanism to `package-qa` manual actionGrzegorz Bizon2017-11-242-20/+91
|/ / /
* | | Merge branch '40465-update-timeago-js' into 'master'Filipa Lacerda2017-11-242-4/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update timeago.js" Closes #40465 See merge request gitlab-org/gitlab-ce!15553
| * | | 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 created Closes #40374 See merge request gitlab-org/gitlab-ce!15528
| * | 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 removed Closes #36400 See merge request gitlab-org/gitlab-ce!15447
| * | | 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('foo', force) Closes #38916 See merge request gitlab-org/gitlab-ce!15552
| * | | Add classList polyfill for IE classList.toggle(.., force)38916-add-classlist-polyfillEric Eastwood2017-11-243-270/+60
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38916
* | | | 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 scope Closes #40466 See merge request gitlab-org/gitlab-ce!15571
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Update Prometheus Gem version and disable Prometheus method call instrumentation by default. Closes gitlab-ee#4139 and #40457 See merge request gitlab-org/gitlab-ce!15558
| * | | | Use feature flag instead of application settigns to control if method calls ↵pawel/update_prometheus_gem_to_well_tested_versionPawel Chojnacki2017-11-237-38/+7
| | | | | | | | | | | | | | | | | | | | should be instrumented
| * | | | 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
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'fix/import-uploads-hashed-storage' into 'master'Nick Thomas2017-11-234-2/+122
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hashed storage for attachments bugs Closes #40280 See merge request gitlab-org/gitlab-ce!15482
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clean up repository fetch and mirror methods See merge request gitlab-org/gitlab-ce!15424
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed import of render mermaid & render math methods See merge request gitlab-org/gitlab-ce!15550
| * | | | | 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 LegacyApiUpdateService See merge request gitlab-org/gitlab-ce!15575
| * | | | | | 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 checklist See merge request gitlab-org/gitlab-ce!15577
| * | | | | | Simplify the DB changes checklistsimplify-db-changes-templateYorick Peterse2017-11-231-37/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes some somewhat redundant checkboxes from the template and rephrases the introduction now that those settings are in GDK. [ci skip]
* | | | | | | Merge branch '39887-move-identical-check-to-merged-branches' into 'master'Douwe Maan2017-11-237-32/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move identical merged branch check to merged_branch_names Closes #39887 See merge request gitlab-org/gitlab-ce!15464
| * | | | | | | 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 migrations See merge request gitlab-org/gitlab-ce!15576