| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use %r around multi-line regular expressions | Douwe Maan | 2018-02-02 | 1 | -4/+4 |
| | | |||||
| * | Merge branch '24167__color_label' into 'master' | Douwe Maan | 2018-02-02 | 4 | -0/+77 |
| |\ | | | | | | | | | | | | | Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095 | ||||
| | * | Fix minors | Tony Rom | 2018-02-01 | 1 | -14/+8 |
| | | | |||||
| | * | Add Colors to GitLab Flavored Markdown | Tony Rom | 2018-01-29 | 4 | -0/+83 |
| | | | |||||
| * | | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' ↵ | Douwe Maan | 2018-02-02 | 1 | -6/+22 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sanitize extra blank spaces used when uploading a SSH key Closes #40552 See merge request gitlab-org/gitlab-ce!16821 | ||||
| | * | | Sanitize extra blank spaces used when uploading a SSH key | Rubén Dávila | 2018-02-01 | 1 | -6/+22 |
| | | | | |||||
| * | | | Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ↵ | Douwe Maan | 2018-02-02 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Avoid error when creating forks and restricted levels are defined Closes #42607 See merge request gitlab-org/gitlab-ce!16881 | ||||
| | * | | | Avoid error when no restricted levels are definedbvl-fix-500-on-fork-without-restricted-visibility-levels | Bob Van Landuyt | 2018-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When no visibility levels are defined they could sometimes return `nil` instead of an empty array. In this case we want to allow all levels. | ||||
| * | | | | use Gitlab::UserSettings directly as a singleton instead of ↵ | Mario de la Ossa | 2018-02-02 | 16 | -105/+85 |
| | | | | | | | | | | | | | | | | | including/extending it | ||||
| * | | | | fix label issue | James Lopez | 2018-02-02 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into '3867-port-to-ce' | Sean McGivern | 2018-02-02 | 3 | -2/+28 |
| |\ \ \ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | | | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-long | Alejandro Rodríguez | 2018-02-01 | 1 | -1/+1 |
| | |/ / / | | | | | | | | | | | | | This was affecting the performance of `Gitlab::Git::Repository#squash`. | ||||
| | * | | | Merge branch 'gitaly-970-repo-write-config' into 'master' | Robert Speicher | 2018-02-01 | 3 | -1/+27 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#write_config to Gitaly Closes gitaly#970 See merge request gitlab-org/gitlab-ce!16730 | ||||
| | | * | | | Migrate Gitlab::Git::Repository#write_config to Gitalygitaly-970-repo-write-config | Kim "BKC" Carlbäcker | 2018-01-31 | 3 | -1/+27 |
| | | | | | | | | | | | | | | | | | | | | | - Add tests for Repository#write_config | ||||
| * | | | | | port of 594e6a0a625^..f74c90f68c6 | Micaël Bergeron | 2018-02-01 | 8 | -18/+22 |
| |/ / / / | |||||
| * | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master' | Rémy Coutable | 2018-02-01 | 33 | -56/+56 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/RegexpLiteral cop Closes #42497 See merge request gitlab-org/gitlab-ce!16752 | ||||
| | * | | | | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 33 | -56/+56 |
| | |/ / / | |||||
| * | | | | Merge branch 'repository-log-disable-walk' into 'master' | Douwe Maan | 2018-01-31 | 2 | -25/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove Rugged::Walk implementation of #log See merge request gitlab-org/gitlab-ce!16798 | ||||
| | * | | | | Remove Rugged::Walk implementation of #logrepository-log-disable-walk | Jacob Vosmaer | 2018-01-31 | 2 | -25/+2 |
| | | | | | | |||||
| * | | | | | [ci skip] Fix example commands to refer to the correct versions | Alejandro Rodríguez | 2018-01-31 | 1 | -1/+1 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge branch 'rugged-reference-cache-rescue' into 'master' | Sean McGivern | 2018-01-31 | 1 | -0/+2 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Stop rescuing Rugged::Reference in Repository cache See merge request gitlab-org/gitlab-ce!16770 | ||||
| | * | | | Remove Rugged exception in cache rescuerugged-reference-cache-rescue | Jacob Vosmaer | 2018-01-30 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'sh-fix-project-members-api-perf' into 'master' | Rémy Coutable | 2018-01-31 | 4 | -30/+25 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints See merge request gitlab-org/gitlab-ce!16751 | ||||
| | * | | | | Remove N+1 queries with /projects/:project_id/{access_requests,members} API ↵sh-fix-project-members-api-perf | Stan Hu | 2018-01-30 | 4 | -30/+25 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endpoints We can simplify the code quite a bit and improve performance by using grape-entity merge fields: https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields Relates to #42030 | ||||
| * | | | | Merge branch 'zj-gitaly-server-info' into 'master' | Sean McGivern | 2018-01-31 | 2 | -0/+59 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794 | ||||
| | * | | | | Gitaly Server info for admin panel | Zeger-Jan van de Weg | 2018-01-31 | 2 | -0/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the client side for gitlab-org/gitaly#819. Which is a server info command. This checks the server version and git binairy version on the server. A small UI was added for administrators, so they can check the status of the Gitaly server. This is done for each storage the monolith knows. Because of this commit, gitlab-org/gitlab-ce!15580 is now closed. That MR removed the Git version too, but didn't replace it with anything. | ||||
| * | | | | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master' | Grzegorz Bizon | 2018-01-31 | 1 | -0/+18 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Move Repository#can_be_merged? to Gitlab::Git::Repository Closes #42544 See merge request gitlab-org/gitlab-ce!16771 | ||||
| | * | | | | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-git | Ahmad Sherif | 2018-01-30 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | Fixes #42544 | ||||
| * | | | | | Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into ↵42613-clean-up-old-project-permissions-frontend-code42242-clean-up-error-handling-in-project-permissions-page | Robert Speicher | 2018-01-30 | 1 | -1/+7 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add support for PreReceiveError in UserMergeBranch RPC Closes gitaly#979 See merge request gitlab-org/gitlab-ce!16765 | ||||
| | * | | | | | Add support for PreReceiveError in UserMergeBranch RPCfix/add-support-for-pre-receive-error-in-merge-branch | Ahmad Sherif | 2018-01-30 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#979 | ||||
| * | | | | | | Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master' | Robert Speicher | 2018-01-30 | 2 | -13/+30 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Git::Repository#delete_refs to Gitaly Closes gitaly#967 See merge request gitlab-org/gitlab-ce!16723 | ||||
| | * | | | | | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitaly | Ahmad Sherif | 2018-01-30 | 2 | -13/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#967 | ||||
| * | | | | | | Merge branch '41771-reduce-cardinality-of-metrics' into 'master' | Grzegorz Bizon | 2018-01-30 | 11 | -324/+450 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce the cardinality of GitLab metrics Closes #41771 See merge request gitlab-org/gitlab-ce!16443 | ||||
| | * | | | | | Rename Concern -> Methods41771-reduce-cardinality-of-metrics | Pawel Chojnacki | 2018-01-29 | 8 | -8/+8 |
| | | | | | | | |||||
| | * | | | | | add comment aabout hotspots | Pawel Chojnacki | 2018-01-29 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | remove unused (?) variables | Pawel Chojnacki | 2018-01-29 | 1 | -3/+0 |
| | | | | | | | |||||
| | * | | | | | Use class variables for metrics provider cache | Pawel Chojnacki | 2018-01-29 | 1 | -6/+5 |
| | | | | | | | |||||
| | * | | | | | fix typo in the buckets | Pawel Chojnacki | 2018-01-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Do not use include Gitlab::CurrentSettings unnecessarily | Pawel Chojnacki | 2018-01-29 | 2 | -13/+15 |
| | | | | | | | |||||
| | * | | | | | Let mutex be initialized only once | Pawel Chojnacki | 2018-01-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fix wrong histograam buckets | Pawel Chojnacki | 2018-01-29 | 2 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Add missing feature gate for cpu metrics | Pawel Chojnacki | 2018-01-29 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Refactor metrics to use metrics dsl notation | Pawel Chojnacki | 2018-01-29 | 3 | -20/+24 |
| | | | | | | | |||||
| | * | | | | | Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is ↵ | Pawel Chojnacki | 2018-01-29 | 4 | -148/+152 |
| | | | | | | | | | | | | | | | | | | | | | | | | | inherited. | ||||
| | * | | | | | Move prometheus metrics to module. Use class instance variables for metrics ↵ | Pawel Chojnacki | 2018-01-29 | 4 | -52/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | and metrics cache in metrics concern | ||||
| | * | | | | | use class variable for Mutex instead of Const | Pawel Chojnacki | 2018-01-29 | 1 | -2/+7 |
| | | | | | | | |||||
| | * | | | | | Cleanup rspec | Pawel Chojnacki | 2018-01-29 | 1 | -10/+6 |
| | | | | | | | |||||
| | * | | | | | NullMetric as a singleton | Pawel Chojnacki | 2018-01-29 | 3 | -2/+4 |
| | | | | | | | |||||
| | * | | | | | Avoid cascading locking | Pawel Chojnacki | 2018-01-29 | 1 | -6/+12 |
| | | | | | | | |||||
| | * | | | | | Migrate and reduce the buckets of Gitaly metrics | Pawel Chojnacki | 2018-01-29 | 2 | -25/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @bjk-gitlab /cc @zj | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |