Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix rspec errors, and add more tests to MethodCall and ActionView | Pawel Chojnacki | 2017-11-02 | 3 | -4/+53 |
| | |||||
* | Cache spec check if prometheus metrics are triggered | Pawel Chojnacki | 2017-11-02 | 1 | -3/+15 |
| | |||||
* | Rails cache spec | Pawel Chojnacki | 2017-11-02 | 1 | -28/+29 |
| | |||||
* | Fix Active record and transaction specs | Pawel Chojnacki | 2017-11-02 | 3 | -9/+21 |
| | |||||
* | Ruby sampler spec | Pawel Chojnacki | 2017-11-02 | 1 | -0/+92 |
| | |||||
* | Cleanup transaction metrics | Pawel Chojnacki | 2017-11-02 | 1 | -0/+0 |
| | |||||
* | Remove transaction tags and map transaction metrics to prometheus | Pawel Chojnacki | 2017-11-02 | 2 | -33/+0 |
| | | | | | | + clean transaction metrics + Gemfile.lock file update | ||||
* | Add GC sampler and small refactor of samplers | Pawel Chojnacki | 2017-11-02 | 3 | -2/+2 |
| | |||||
* | Merge branch 'gitaly-ff-merge' into 'master' | Rémy Coutable | 2017-11-02 | 2 | -21/+73 |
|\ | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserFFBranch RPC Closes gitaly#693 See merge request gitlab-org/gitlab-ce!15040 | ||||
| * | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-merge | Alejandro Rodríguez | 2017-10-31 | 2 | -21/+73 |
| | | |||||
* | | Merge branch 'icons-ci-icons' into 'master' | Filipa Lacerda | 2017-11-02 | 15 | -23/+23 |
|\ \ | | | | | | | | | | | | | Convert Icons in CI to SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14567 | ||||
| * | | Fixes one icon test | Tim Zallmann | 2017-10-30 | 1 | -1/+1 |
| | | | |||||
| * | | Test Fixes | Tim Zallmann | 2017-10-30 | 2 | -2/+2 |
| | | | |||||
| * | | Fixes for Tests | Tim Zallmann | 2017-10-30 | 6 | -14/+14 |
| | | | |||||
| * | | Updated also Badge + Dropdown Icons | Tim Zallmann | 2017-10-30 | 9 | -9/+9 |
| | | | |||||
* | | | Merge branch 'dm-sidekiq-sigstp' into 'master' | Sean McGivern | 2017-11-02 | 1 | -0/+63 |
|\ \ \ | | | | | | | | | | | | | | | | | Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in See merge request gitlab-org/gitlab-ce!15102 | ||||
| * | | | Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when ↵dm-sidekiq-sigstp | Douwe Maan | 2017-11-02 | 1 | -0/+63 |
| | | | | | | | | | | | | | | | | the memory killer kicks in | ||||
* | | | | Merge branch 'dm-remove-private-token' into 'master' | Sean McGivern | 2017-11-02 | 1 | -7/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Private Tokens Closes #38595 and #38447 See merge request gitlab-org/gitlab-ce!14838 | ||||
| * | | | | Add sudo API scope | Douwe Maan | 2017-11-02 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Consistently use PersonalAccessToken instead of PersonalToken | Douwe Maan | 2017-11-02 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Merge branch 'remove-readonly-exclusion-from-systemcheck' into 'master' | Douwe Maan | 2017-11-02 | 1 | -8/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove an exception from the git user default SSH config check See merge request gitlab-org/gitlab-ce!15151 | ||||
| * | | | | | Remove an exception from the git user default SSH config check | Nick Thomas | 2017-11-02 | 1 | -8/+0 |
| | | | | | | |||||
* | | | | | | Merge branch 'jk-epic-changes-ce-port' into 'master' | Sean McGivern | 2017-11-02 | 6 | -0/+138 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | CE port of code changed for epics See merge request gitlab-org/gitlab-ce!15144 | ||||
| * | | | | | CE port of code changed for epicsjk-epic-changes-ce-port | Jarka Kadlecova | 2017-11-02 | 6 | -0/+138 |
| | |/ / / | |/| | | | |||||
* | | | | | Geo route whitelisting is too optimistic | Brett Walker | 2017-11-02 | 1 | -0/+26 |
| |/ / / |/| | | | |||||
* | | | | Fix encoding issue with Repository.ls_files | Kim Carlbäcker | 2017-11-02 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge branch 'jej/lfs-change-detection' into 'master' | Douwe Maan | 2017-11-01 | 4 | -29/+179 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Detect changes to LFS pointers for pruning and integrity check See merge request gitlab-org/gitlab-ce!14785 | ||||
| * | | | Detect changes to LFS pointers for pruning and integrity check | James Edwards-Jones | 2017-11-01 | 4 | -29/+179 |
| | | | | | | | | | | | | | | | | Gitlab::Git::Blob.batch_lfs_metadata can be used to check for LFS pointers. It uses a lazy enumorator and filters by blob size | ||||
* | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master' | Sean McGivern | 2017-11-01 | 1 | -20/+28 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add metrics tagging to the sidekiq middleware See merge request gitlab-org/gitlab-ce!15111 | ||||
| * | | | | reword `targets` to `metric tags` | micael.bergeron | 2017-10-31 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | add changelog | ||||
| * | | | | add metrics tagging to the sidekiq middleware | micael.bergeron | 2017-10-31 | 1 | -20/+28 |
| | | | | | |||||
* | | | | | Merge branch 'backport-workhorse-show-all-refs' into 'master' | Douwe Maan | 2017-11-01 | 1 | -2/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Support show-all-refs for git over HTTP See merge request gitlab-org/gitlab-ce!14834 | ||||
| * | | | | | Support show-all-refs for git over HTTP | Nick Thomas | 2017-10-30 | 1 | -2/+16 |
| | | | | | | |||||
* | | | | | | Merge branch 'go-get-ssh' into 'master' | Douwe Maan | 2017-11-01 | 1 | -53/+85 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns a SSH url for go-get=1 Closes #38858 See merge request gitlab-org/gitlab-ce!14990 | ||||
| * | | | | | | Returns a ssh url for go-get=1 | Guilherme Vieira | 2017-10-31 | 1 | -53/+85 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master' | Sean McGivern | 2017-10-31 | 4 | -7/+9 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalize LDAP DN when looking up identity Closes #39559 See merge request gitlab-org/gitlab-ce!15103 | ||||
| * | | | | | | Normalize LDAP DN when looking up identity | Douwe Maan | 2017-10-31 | 4 | -7/+9 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'fix/import-issue-assignees' into 'master' | Sean McGivern | 2017-10-31 | 5 | -1/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing issue assignees Closes #39170 See merge request gitlab-org/gitlab-ce!15109 | ||||
| * | | | | | | fix spec failure | James Lopez | 2017-10-31 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | fix specsfix/import-issue-assignees | James Lopez | 2017-10-31 | 3 | -7/+10 |
| | | | | | | | |||||
| * | | | | | | fix missing issue assignees | James Lopez | 2017-10-31 | 3 | -1/+15 |
| | | | | | | | |||||
* | | | | | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master' | Sean McGivern | 2017-10-31 | 1 | -0/+22 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle large values on `MergeRequestDiffCommit` dates Closes #39561 See merge request gitlab-org/gitlab-ce!15093 | ||||
| * | | | | | | | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-test | Alejandro Rodríguez | 2017-10-30 | 1 | -0/+22 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'add-packagist-project-service' into 'master' | Kamil Trzciński | 2017-10-31 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | Add Packagist project service See merge request gitlab-org/gitlab-ce!14493 | ||||
| * | | | | | | Add Packagist project service | Matt Coleman | 2017-10-13 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Only set Auto-Submitted header once39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses | Sean McGivern | 2017-10-30 | 1 | -2/+19 |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emails on push feature reuses the same email object, to avoid the expensive work of generating the email body. This interceptor would previously set multiple values for the same header, as that's the mail gem's default behaviour when called with the same header more than once. We don't want to change the emails on push service (although it's the only place where this happens), but fixing the interceptor is just as sensible anyway. | ||||
* | | | | | | Fix 500 error for old (somewhat) MRs | AlexWayfer | 2017-10-30 | 1 | -0/+37 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fetch the merged branches at once | Lin Jen-Shin (godfat) | 2017-10-27 | 2 | -0/+58 |
| | | | | | |||||
* | | | | | Merge branch 'fix/add-path-attr-to-wiki-file' into 'master' | Sean McGivern | 2017-10-26 | 1 | -3/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add path attribute to WikiFile class Closes #39420 See merge request gitlab-org/gitlab-ce!15019 | ||||
| * | | | | | Add path attribute to WikiFile class | Ahmad Sherif | 2017-10-26 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #39420 |