summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Close low level rugged repository in project cache workerBastian Blank2018-02-061-0/+4
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* | | | | | | | | | | | | Merge branch 'zj/gitlab-ce-zj-wiki-page-versions'Douwe Maan2018-02-062-9/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'zj-wiki-page-versions'Douwe Maan2018-02-06111-798/+2343
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| * | | | | | | | | | | | | | Allow pagination for WikiVersions on Gitaly requestZeger-Jan van de Weg2018-01-222-41/+17
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Client implementation for WikiPageVerionZeger-Jan van de Weg2018-01-222-15/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of gitlab-org/gitaly#639
* | | | | | | | | | | | | | | Merge branch 'gitaly-lfs-client-prep' into 'master'Robert Speicher2018-02-065-54/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Gitlab::Git code related to LFS changes for Gitaly migration Closes gitaly#980 See merge request gitlab-org/gitlab-ce!16835
| * | | | | | | | | | | | | | Refactor Gitlab::Git code related to LFS changes for Gitaly migrationgitaly-lfs-client-prepAlejandro Rodríguez2018-02-025-54/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We stop relying on Gitlab::Git::Env for the RevList class, and use Gitlab::Git::Repository#run_git methods inteaad. The refactor also fixes another issue, since we now top using "path_to_repo" (which is a Repository model method).
* | | | | | | | | | | | | | | Merge branch 'jej/upload-file-tracks-lfs' into 'master'Sean McGivern2018-02-061-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File upload UI obeys LFS filter Closes #29876 See merge request gitlab-org/gitlab-ce!16412
| * | | | | | | | | | | | | | File upload UI obeys LFS filtersJames Edwards-Jones2018-02-061-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses Lfs::FileModificationHandler to coordinate LFS detection, creation of LfsObject, etc Caveats: 1. This isn't used by the multi-file editor / Web IDE 2. This isn't used on rename. We'd need to be able to download LFS files and add them to the commit if they no longer match so not as simple. 3. We only check the root .gitattributes file, so this should be improved to correctly check for nested .gitattributes files in subfolders.
* | | | | | | | | | | | | | | Merge branch 'bump-workhorse' into 'master'Nick Thomas2018-02-061-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade GitLab Workhorse to v3.6.0 See merge request gitlab-org/gitlab-ce!16946
| * | | | | | | | | | | | | | Upgrade GitLab Workhorse to v3.6.0Kamil Trzciński2018-02-061-0/+12
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Rename CreateArtifactsTraceService to CreateTraceArtifactServiceShinya Maeda2018-02-061-8/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Revert live-trace pathShinya Maeda2018-02-061-24/+12
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Add CreateArtifactsTraceWorkerShinya Maeda2018-02-061-6/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Expose current_pathShinya Maeda2018-02-061-6/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Check existance of the file when trace_artifact is readShinya Maeda2018-02-061-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Move default_path to legacy_default_path. Switch to the new path for live-traceShinya Maeda2018-02-061-10/+28
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Remove unnecessary changesShinya Maeda2018-02-061-6/+10
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Trace as artifactsShinya Maeda2018-02-061-8/+14
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Added ldap config setting to lower case usernamesFrancisco Javier López2018-02-053-1/+13
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 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 '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 'query-counts' into 'master'Rémy Coutable2018-02-054-0/+185
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-0/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | 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-0214-98/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-016-14/+18
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '42497-rubocop-style-regexpliteral' into 'master'Rémy Coutable2018-02-0126-40/+40
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/RegexpLiteral cop Closes #42497 See merge request gitlab-org/gitlab-ce!16752
| * | | | | | | | | | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-0126-40/+40
| |/ / / / / / / / / /