Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | static-analysis fix40352-ignore-hashed-repos-cleanup-dirs | digitalMoksha | 2017-11-25 | 1 | -2/+1 |
| | |||||
* | refactored the hashed repository name | digitalMoksha | 2017-11-25 | 1 | -2/+5 |
| | |||||
* | static analysis fix | digitalMoksha | 2017-11-24 | 1 | -1/+0 |
| | |||||
* | added changelog | digitalMoksha | 2017-11-24 | 2 | -0/+10 |
| | |||||
* | ignore hashed repositories when doing rake gitlab:cleanup:dirs | digitalMoksha | 2017-11-24 | 2 | -11/+39 |
| | |||||
* | Merge branch 'jej/fix-protected-branch-validations-ce' into 'master' | Rémy Coutable | 2017-11-24 | 8 | -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-ce | James Edwards-Jones | 2017-11-24 | 6 | -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 validations | James Edwards-Jones | 2017-11-24 | 5 | -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 McGivern | 2017-11-24 | 6 | -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-performance | Douwe Maan | 2017-11-24 | 6 | -44/+18 |
| | | | | | | | | | | | | namespace name | ||||
* | | | Merge branch 'qa/gb/add-feedback-to-package-qa-action' into 'master' | Rémy Coutable | 2017-11-24 | 2 | -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 action | Grzegorz Bizon | 2017-11-24 | 2 | -20/+91 |
|/ / / | |||||
* | | | Merge branch '40465-update-timeago-js' into 'master' | Filipa Lacerda | 2017-11-24 | 2 | -4/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update timeago.js" Closes #40465 See merge request gitlab-org/gitlab-ce!15553 | ||||
| * | | | Updated timeago.js | Tim Zallmann | 2017-11-24 | 2 | -4/+14 |
| |/ / | |||||
* | | | Merge branch 'issue_40374' into 'master' | Sean McGivern | 2017-11-24 | 8 | -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_40374 | Felipe Artur | 2017-11-23 | 8 | -40/+95 |
| | | | |||||
* | | | Merge branch '36400-trigger-job' into 'master' | Tim Zallmann | 2017-11-24 | 3 | -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 removed | Filipa Lacerda | 2017-11-24 | 3 | -3/+34 |
|/ / / | |||||
* | | | Merge branch '38916-add-classlist-polyfill' into 'master' | Filipa Lacerda | 2017-11-24 | 3 | -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-polyfill | Eric Eastwood | 2017-11-24 | 3 | -270/+60 |
| | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38916 | ||||
* | | | | Merge branch 'dm-fix-registry-with-sudo-token' into 'master' | Sean McGivern | 2017-11-24 | 3 | -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-token | Douwe Maan | 2017-11-23 | 3 | -16/+16 |
| | | | | | |||||
* | | | | | Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master' | Douwe Maan | 2017-11-24 | 8 | -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_version | Pawel Chojnacki | 2017-11-23 | 7 | -38/+7 |
| | | | | | | | | | | | | | | | | | | | | should be instrumented | ||||
| * | | | | Rename wip to worker_id | Pawel Chojnacki | 2017-11-23 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | add missing schema entry and application settigns helper | Pawel Chojnacki | 2017-11-23 | 2 | -1/+3 |
| | | | | | |||||
| * | | | | Use only real duration to measure method call performance via Prometheus | Pawel Chojnacki | 2017-11-23 | 3 | -35/+15 |
| | | | | | |||||
| * | | | | check method timing threshold when observing method performance | Pawel Chojnacki | 2017-11-23 | 2 | -10/+59 |
| | | | | | |||||
| * | | | | Add changelog for #15558 | Pawel Chojnacki | 2017-11-23 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Reenable prometheus metrics | Pawel Chojnacki | 2017-11-23 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Move prometheus middle ware to prometheus initialized. | Pawel Chojnacki | 2017-11-23 | 8 | -11/+43 |
| | | | | | |||||
| * | | | | Update prometheus-client-gem to 0.7.0.beta33 | Pawel Chojnacki | 2017-11-23 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | Update CHANGELOG.md for 10.2.2 | Michael Kozono | 2017-11-23 | 11 | -50/+22 |
| | | | | | | | | | | | | | | | [ci skip] | ||||
* | | | | | Merge branch 'fix/import-uploads-hashed-storage' into 'master' | Nick Thomas | 2017-11-23 | 4 | -2/+122 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix hashed storage for attachments bugs Closes #40280 See merge request gitlab-org/gitlab-ce!15482 | ||||
| * | | | | | Fix hashed storage for attachments bugs | James Lopez | 2017-11-23 | 4 | -2/+122 |
|/ / / / / | |||||
* | | | | | Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master' | Sean McGivern | 2017-11-23 | 9 | -118/+77 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Clean up repository fetch and mirror methods See merge request gitlab-org/gitlab-ce!15424 | ||||
| * | | | | | Rename fetch_refs to refmap | Douwe Maan | 2017-11-23 | 7 | -28/+29 |
| | | | | | | |||||
| * | | | | | Clean up repository fetch and mirror methods | Douwe Maan | 2017-11-23 | 9 | -115/+73 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'fix-mermaid-import' into 'master' | Filipa Lacerda | 2017-11-23 | 5 | -58/+50 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed import of render mermaid & render math methods See merge request gitlab-org/gitlab-ce!15550 | ||||
| * | | | | | moved to es6 modulesfix-mermaid-import | Phil Hughes | 2017-11-22 | 4 | -50/+45 |
| | | | | | | |||||
| * | | | | | Fixed import of render mermaid & render math methods | Phil Hughes | 2017-11-22 | 2 | -12/+9 |
| | | | | | | |||||
* | | | | | | Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master' | Rémy Coutable | 2017-11-23 | 3 | -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-service | James Edwards-Jones | 2017-11-23 | 3 | -6/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'simplify-db-changes-template' into 'master' | Rémy Coutable | 2017-11-23 | 1 | -37/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the DB changes checklist See merge request gitlab-org/gitlab-ce!15577 | ||||
| * | | | | | | Simplify the DB changes checklistsimplify-db-changes-template | Yorick Peterse | 2017-11-23 | 1 | -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 Maan | 2017-11-23 | 7 | -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-branches | Lin Jen-Shin | 2017-11-23 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Make sure repository is restored | Lin Jen-Shin | 2017-11-23 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Move identical merged branch check to merged_branch_names | Lin Jen-Shin | 2017-11-23 | 6 | -32/+27 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'reviewing-db-changes' into 'master' | Rémy Coutable | 2017-11-23 | 13 | -0/+104 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Rubocop config for background migrations See merge request gitlab-org/gitlab-ce!15576 |