summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Use %r around multi-line regular expressionsDouwe Maan2018-02-021-4/+4
* Merge branch '24167__color_label' into 'master'Douwe Maan2018-02-024-0/+77
|\
| * Fix minorsTony Rom2018-02-011-14/+8
| * Add Colors to GitLab Flavored MarkdownTony Rom2018-01-294-0/+83
* | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-021-6/+22
|\ \
| * | Sanitize extra blank spaces used when uploading a SSH keyRubén Dávila2018-02-011-6/+22
* | | Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ...Douwe Maan2018-02-021-1/+1
|\ \ \
| * | | Avoid error when no restricted levels are definedbvl-fix-500-on-fork-without-restricted-visibility-levelsBob Van Landuyt2018-02-021-1/+1
* | | | use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-0216-105/+85
* | | | fix label issueJames Lopez2018-02-021-3/+2
* | | | Merge branch 'master' into '3867-port-to-ce'Sean McGivern2018-02-023-2/+28
|\ \ \ \
| * | | | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-longAlejandro Rodríguez2018-02-011-1/+1
| |/ / /
| * | | Merge branch 'gitaly-970-repo-write-config' into 'master'Robert Speicher2018-02-013-1/+27
| |\ \ \
| | * | | Migrate Gitlab::Git::Repository#write_config to Gitalygitaly-970-repo-write-configKim "BKC" Carlbäcker2018-01-313-1/+27
* | | | | port of 594e6a0a625^..f74c90f68c6Micaël Bergeron2018-02-018-18/+22
|/ / / /
* | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-0133-56/+56
|\ \ \ \
| * | | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-0133-56/+56
| |/ / /
* | | | Merge branch 'repository-log-disable-walk' into 'master'Douwe Maan2018-01-312-25/+2
|\ \ \ \
| * | | | Remove Rugged::Walk implementation of #logrepository-log-disable-walkJacob Vosmaer2018-01-312-25/+2
* | | | | [ci skip] Fix example commands to refer to the correct versionsAlejandro Rodríguez2018-01-311-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'rugged-reference-cache-rescue' into 'master'Sean McGivern2018-01-311-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove Rugged exception in cache rescuerugged-reference-cache-rescueJacob Vosmaer2018-01-301-0/+2
* | | | Merge branch 'sh-fix-project-members-api-perf' into 'master'Rémy Coutable2018-01-314-30/+25
|\ \ \ \
| * | | | Remove N+1 queries with /projects/:project_id/{access_requests,members} API e...sh-fix-project-members-api-perfStan Hu2018-01-304-30/+25
| | |/ / | |/| |
* | | | Merge branch 'zj-gitaly-server-info' into 'master'Sean McGivern2018-01-312-0/+59
|\ \ \ \
| * | | | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-312-0/+59
* | | | | Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'Grzegorz Bizon2018-01-311-0/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move Repository#can_be_merged? to Gitlab::Git::Repositoryfix/move-can-be-merged-to-lib-gitAhmad Sherif2018-01-301-0/+18
* | | | | Merge branch 'fix/add-support-for-pre-receive-error-in-merge-branch' into 'ma...42613-clean-up-old-project-permissions-frontend-code42242-clean-up-error-handling-in-project-permissions-pageRobert Speicher2018-01-301-1/+7
|\ \ \ \ \
| * | | | | Add support for PreReceiveError in UserMergeBranch RPCfix/add-support-for-pre-receive-error-in-merge-branchAhmad Sherif2018-01-301-1/+7
* | | | | | Merge branch 'feature/migrate-delete-refs-to-gitaly' into 'master'Robert Speicher2018-01-302-13/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-302-13/+30
* | | | | | Merge branch '41771-reduce-cardinality-of-metrics' into 'master'Grzegorz Bizon2018-01-3011-324/+450
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Rename Concern -> Methods41771-reduce-cardinality-of-metricsPawel Chojnacki2018-01-298-8/+8
| * | | | | add comment aabout hotspotsPawel Chojnacki2018-01-291-0/+1
| * | | | | remove unused (?) variablesPawel Chojnacki2018-01-291-3/+0
| * | | | | Use class variables for metrics provider cachePawel Chojnacki2018-01-291-6/+5
| * | | | | fix typo in the bucketsPawel Chojnacki2018-01-291-1/+1
| * | | | | Do not use include Gitlab::CurrentSettings unnecessarilyPawel Chojnacki2018-01-292-13/+15
| * | | | | Let mutex be initialized only oncePawel Chojnacki2018-01-291-1/+1
| * | | | | Fix wrong histograam bucketsPawel Chojnacki2018-01-292-2/+2
| * | | | | Add missing feature gate for cpu metricsPawel Chojnacki2018-01-291-1/+1
| * | | | | Refactor metrics to use metrics dsl notationPawel Chojnacki2018-01-293-20/+24
| * | | | | Convert InfluxDB to concern. Fix uninitialized metrics when metrics code is i...Pawel Chojnacki2018-01-294-148/+152
| * | | | | Move prometheus metrics to module. Use class instance variables for metrics a...Pawel Chojnacki2018-01-294-52/+57
| * | | | | use class variable for Mutex instead of ConstPawel Chojnacki2018-01-291-2/+7
| * | | | | Cleanup rspecPawel Chojnacki2018-01-291-10/+6
| * | | | | NullMetric as a singletonPawel Chojnacki2018-01-293-2/+4
| * | | | | Avoid cascading lockingPawel Chojnacki2018-01-291-6/+12
| * | | | | Migrate and reduce the buckets of Gitaly metricsPawel Chojnacki2018-01-292-25/+12
View Lorry Controller Status