summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into jivl-update-katexJose Ivan Vargas2018-02-05272-1839/+5328
|\
| * Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-5/+19
| |
| * Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master'Robert Speicher2018-02-051-0/+5
| |\ | | | | | | | | | | | | Encode GitalyClient::WikiPage attributes to UTF-8 See merge request gitlab-org/gitlab-ce!16925
| | * Encode GitalyClient::WikiPage attributes to UTF-8fix/gitaly-wiki-encoding-issuesAhmad Sherif2018-02-051-0/+5
| | |
| * | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-051-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779
| | * | add the uploader context to the upload modelMicaël Bergeron2018-02-021-1/+1
| | | |
| * | | Enable Prometheus metrics for deployed IngressesJoshua Lambert2018-02-051-2/+6
| | | |
| * | | Merge branch 'api-guard' into 'master'Rémy Coutable2018-02-051-1/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Make find_user_from_sources extensible for EE See merge request gitlab-org/gitlab-ce!16924
| | * | | Make find_user_from_sources extensible for EELin Jen-Shin2018-02-051-1/+5
| | | | |
| * | | | Merge branch 'gitaly-user-squash' into 'master'Rémy Coutable2018-02-052-26/+63
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Incorporate OperationService.UserSquash Gitaly RPC Closes gitaly#991 See merge request gitlab-org/gitlab-ce!16899
| | * | | Incorporate OperationService.UserSquash Gitaly RPCgitaly-user-squashAlejandro Rodríguez2018-02-022-26/+63
| | | | |
| * | | | Merge branch 'zj-fix-flay' into 'master'Rémy Coutable2018-02-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix flay not detecting identical code Closes #42628 See merge request gitlab-org/gitlab-ce!16828
| | * | | | Fix flay not detecting identical codeZeger-Jan van de Weg2018-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the script checked only for 'Similar code', but flay will tell users when IDENTICAL code is detected too. This should create a commit will create a failing pipeline, and to check that it does this commit is pushed. Fixes #42628
| * | | | | Merge branch 'query-counts' into 'master'Rémy Coutable2018-02-0516-0/+223
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track and act upon the number of executed SQL queries See merge request gitlab-org/gitlab-ce!16466
| | * | | | | Track and act upon the number of executed queriesquery-countsYorick Peterse2018-02-0116-0/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that we have more visibility in the number of SQL queries that are executed in web requests. The current threshold is hardcoded to 100 as we will rarely (maybe once or twice) change it. In production and development we use Sentry if enabled, in the test environment we raise an error. This feature is also only enabled in production/staging when running on GitLab.com as it's not very useful to other users.
| * | | | | | Merge branch '25327-coverage-badge-rounding' into 'master'Rémy Coutable2018-02-052-3/+3
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Change rounding on code coverage badge to be consistent with other displays See merge request gitlab-org/gitlab-ce!10083
| | * | | | | Change coverage badge rounding for other CI system consistencyJeff Stubler2018-02-012-3/+3
| | |/ / / /
| * | | | | Merge branch 'zj-ref-contains' into 'master'Douwe Maan2018-02-044-16/+63
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client changes for Tag,BranchNamesContainingCommit See merge request gitlab-org/gitlab-ce!16789
| | * \ \ \ \ Merge branch 'master' into 'zj-ref-contains'zj-ref-containsDouwe Maan2018-02-013-1/+27
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/gitlab/git/repository.rb
| | * | | | | | Remove intermediate methods on Branch and Tag classesZeger-Jan van de Weg2018-02-014-28/+17
| | | | | | | |
| | * | | | | | Fix encoding issues when name is not UTF-8Zeger-Jan van de Weg2018-02-011-2/+8
| | | | | | | |
| | * | | | | | Client changes for Tag,BranchNamesContainingCommitZeger-Jan van de Weg2018-02-014-21/+73
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of gitlab-org/gitaly#884, this commit contains the client implementation for both TagNamesContaintingCommit and BranchNamesContainingCommit. The interface in the Repository model stays the same, but the implementation on the serverside, e.g. Gitaly, uses `for-each-ref`, as opposed to `branch` or `tag` which both aren't plumbing command. The result stays the same. On the serverside, we have the opportunity to limit the number of names to return. However, this is not supported on the front end yet. My proposal to use this ability: gitlab-org/gitlab-ce#42581. For now, this ability is not used as that would change more behaviours on a feature flag which might lead to unexpected changes on page refresh for example.
| * | | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Colors to GitLab Flavored Markdown Closes #24167 See merge request gitlab-org/gitlab-ce!16095
| | * | | | | 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' ↵Douwe Maan2018-02-021-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 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
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-levelsBob Van Landuyt2018-02-021-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 Ossa2018-02-0216-105/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including/extending it
| * | | | | | | fix label issueJames Lopez2018-02-021-3/+2
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'master' into '3867-port-to-ce'Sean McGivern2018-02-023-2/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | | | | Fix an issue where sparse checkout wasn't configured correctly42223-squashing-mrs-takes-too-longAlejandro Rodríguez2018-02-011-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | This was affecting the performance of `Gitlab::Git::Repository#squash`.
| | * | | | | Merge branch 'gitaly-970-repo-write-config' into 'master'Robert Speicher2018-02-013-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-configKim "BKC" Carlbäcker2018-01-313-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add tests for Repository#write_config
| * | | | | | 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 Style/RegexpLiteral cop Closes #42497 See merge request gitlab-org/gitlab-ce!16752
| | * | | | | 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 #log See merge request gitlab-org/gitlab-ce!16798
| | * | | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Stop rescuing Rugged::Reference in Repository cache See merge request gitlab-org/gitlab-ce!16770
| | * | | | 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 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-perfStan Hu2018-01-304-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 McGivern2018-01-312-0/+59
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly Server info for admin panel See merge request gitlab-org/gitlab-ce!16794
| | * | | | | Gitaly Server info for admin panelZeger-Jan van de Weg2018-01-312-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 Bizon2018-01-311-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-gitAhmad Sherif2018-01-301-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #42544
View Lorry Controller Status