summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Grzegorz Bizon2018-03-163-4/+20
|\ | | | | | | | | | | | | | | | | '41902-add-api-option-to-overwrite-project-description-on-project-export' into 'master' Resolve "Extend API for exporting a project with option to overwrite project description" Closes #41902 and #34936 See merge request gitlab-org/gitlab-ce!17744
| * Adds the option to override project description on export via APITiago Botelho2018-03-163-4/+20
| | | | | | | | and fixes the project description not being imported
* | Merge branch '44126-setup-middleware-before-adapter' into 'master'Kamil Trzciński2018-03-161-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Eliminate Faraday warnings Closes #44126 See merge request gitlab-org/gitlab-ce!17795
| * | Setup Faraday middleware before adapterLin Jen-Shin2018-03-161-2/+3
| |/ | | | | | | | | | | This eliminate the warnings: WARNING: Unexpected middleware set after the adapter. This won't be supported from Faraday 1.0.
* | Merge branch 'jej/commit-api-tracks-lfs' into 'master'Dmitriy Zaporozhets2018-03-162-3/+11
|\ \ | | | | | | | | | | | | | | | | | | Create commit API and Web IDE obey LFS filters Closes #42287 See merge request gitlab-org/gitlab-ce!16718
| * | Extract constant for LfsPointerFile::VERSION_LINEJames Edwards-Jones2018-03-161-1/+4
| | |
| * | Avoid printing data for LfsPointerFile#inspectjej/commit-api-tracks-lfsJames Edwards-Jones2018-03-151-0/+4
| | |
| * | Lfs::FileTranformer caches .gitattributes parserJames Edwards-Jones2018-03-151-2/+3
| | | | | | | | | | | | Prevents `.gitattributes` blob lookup being repeated for every file checked at a given ref
* | | Merge branch 'sh-cache-table-exists' into 'master'Yorick Peterse2018-03-162-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cache table_exists?('application_settings') to reduce repeated schema reloads Closes #43355 See merge request gitlab-org/gitlab-ce!17781
| * | | Cache table_exists?('application_settings') to reduce repeated schema reloadssh-cache-table-existsStan Hu2018-03-152-1/+6
| | | | | | | | | | | | | | | | Closes #43355
* | | | Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-161-0/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Cache column_exists? for application settings See merge request gitlab-org/gitlab-ce!17780
| * | Cache column_exists? for application settingssh-cache-column-existsStan Hu2018-03-151-0/+4
| | | | | | | | | | | | | | | | | | | | | This is most a backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4987/diffs but includes other columns that use column_exists? in a way that may cause unnecessary schema loads.
* | | Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' ↵Stan Hu2018-03-151-5/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Reduce Redis usage from merge request diffs caching" Closes #44191 See merge request gitlab-org/gitlab-ce!17746
| * | | Only cache MR diffs for one week44191-reduce-redis-usage-from-merge-request-diffs-cachingSean McGivern2018-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | This may lead to some being evicted and having to be cached again, but many MRs get closed or updated in that time anyway.
| * | | Only cache highlight results for latest MR diffsSean McGivern2018-03-151-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Previously, we kept them all in the cache. We don't need the highlight results for older diffs - if someone does view that (which is rare), we can do the highlighting on the fly.
* | | | Merge branch 'adamco/gitlab-ce-move-issue-command' into 'master'Grzegorz Bizon2018-03-153-0/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add slash command for moving an issue See merge request gitlab-org/gitlab-ce!17691
| * | | | Add slash command for moving an issueSean McGivern2018-03-153-0/+99
| | | | | | | | | | | | | | | | | | | | Carried over from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8857
* | | | | Merge branch 'fix-42459-#-in-branch' into 'master'Sean McGivern2018-03-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually escape '#' when building relative uris, closes #42459 Closes #42459 See merge request gitlab-org/gitlab-ce!17679
| * | | | | Manually escape '#' when building relative uris, fixes #42459Jan2018-03-111-1/+1
| | | | | |
* | | | | | Merge branch 'backstage/gb/refactor-ci-cd-variables-collections' into 'master'42762-project-settings-sections-cannot-be-expanded-after-submission-errorKamil Trzciński2018-03-152-0/+88
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce CI/CD variables collection Closes #33042 See merge request gitlab-org/gitlab-ce!14439
| * | | | | | Improve predefined variables collection methodsGrzegorz Bizon2018-03-141-2/+2
| | | | | | |
| * | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-1470-384/+931
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * master: (211 commits)
| * | | | | | | Add more unit tests for variables collection classGrzegorz Bizon2018-03-131-1/+0
| | | | | | | |
| * | | | | | | Improve how we handle persistent runner variablesGrzegorz Bizon2018-03-131-10/+2
| | | | | | | |
| * | | | | | | Make predefined variables in a collection public by defaultGrzegorz Bizon2018-03-131-1/+1
| | | | | | | |
| * | | | | | | DRY project-level predefined variablesGrzegorz Bizon2018-03-131-0/+6
| | | | | | | |
| * | | | | | | Add TODOs to refactoried variables collections codeGrzegorz Bizon2018-03-122-0/+5
| | | | | | | |
| * | | | | | | Use variables collection as build predefined variablesGrzegorz Bizon2018-03-122-2/+8
| | | | | | | |
| * | | | | | | Extract variables collection item to a separate classGrzegorz Bizon2018-03-122-31/+48
| | | | | | | |
| * | | | | | | Document runner's expecations regarding variable collectionGrzegorz Bizon2018-03-121-6/+11
| | | | | | | |
| * | | | | | | Make variables collection to runner mapping explicitGrzegorz Bizon2018-03-071-3/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-07702-6609/+22806
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (6164 commits)
| * | | | | | | | Introduce CI/CD variables collection classGrzegorz Bizon2017-09-221-0/+60
| | | | | | | | |
* | | | | | | | | Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'Yorick Peterse2018-03-151-0/+13
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix concurrency issue with migration for user_interacted_projects table. Closes #44205 See merge request gitlab-org/gitlab-ce!17728
| * | | | | | | | Fix concurrency issue with migration for user_interacted_projects table.ab-44205-user_interacted_projects-migrationAndreas Brandl2018-03-141-0/+13
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The concurrency issue originates from inserts on `user_interacted_projects` from the app while running the post-deploy migration. This change comes with a strategy to lock the table while removing duplicates and creating the unique index (and similar for FK constraints). Also, we'll have a non-unique index until the post-deploy migration is finished to speed up queries during that time. Closes #44205.
* | | | | | | | Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-141-5/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix moving local, unhashed upload or pages directories during group transfer Closes #43993 See merge request gitlab-org/gitlab-ce!17658
| * | | | | | | Fix moving local files during namespace transferMichael Kozono2018-03-131-5/+11
| |/ / / / / /
* | | | | | | Merge branch 'bvl-import-zip-multiple-assignees' into 'master'Sean McGivern2018-03-141-0/+9
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import multiple issue assignees from GitLab export Closes #40275 See merge request gitlab-org/gitlab-ce!17718
| * | | | | | Import multiple issue assignees from GitLab exportBob Van Landuyt2018-03-141-0/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing from a GitLab archive, an admin can carry over the assignations. Other users can not. When a regular user is importing an issue with multiple assignees, the assignee is replaced with the current user, meaning we would try to insert current user as an assignee multiple times. By filtering the array before storing it, the import becomes more robust.
* | | | | | Set Gitlab::Shell#create_repository as OPT_OUTZeger-Jan van de Weg2018-03-141-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On .com repositories are created through Gitaly for a while now. For customers this is not the case unless these have chosen to do so through feature flags. By moving this to opt out, everyone will be using this. This move is part of the migration issue https://gitlab.com/gitlab-org/gitaly/issues/593 The bigger impact this commit will have is that tests that use a repository through `FactoryBot.create(:project, :repository)` will now use Gitaly to do so. As tests run on the same disk, or at least machine, this will most probably slow them down.
* | | | | | Change Gitlab::Shell#add_namespace to #create_namespaceZeger-Jan van de Weg2018-03-142-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, this method was called add_namespace, which broke the CRUD convention and made it harder to grep for what I was looking for. Given the change was a find and replace kind of fix, this was changed without opening an issue and on another feature branch. If more dynamic calls are made to add_namespace, these could've been missed which might lead to incorrect bahaviour. However, going through the commit log it seems thats not the case.
* | | | | Merge branch '44161-use-configured-git' into 'master'Douwe Maan2018-03-131-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "lib/gitlab/git/gitlab_projects.rb does not respect Gitlab.config.git.bin_path" Closes #44161 See merge request gitlab-org/gitlab-ce!17693
| * | | | | Respect the configured git path for imported gitlab-shell operations44161-use-configured-gitNick Thomas2018-03-121-6/+6
| | | | | |
* | | | | | Capture Gitaly calls that don't go through `migrate`Sean McGivern2018-03-132-13/+23
| | | | | |
* | | | | | Add Gitaly call details to the performance barSean McGivern2018-03-132-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same as the SQL queries, show the details of Gitaly calls in the performance bar, as a modal that can be opened in the same way.
* | | | | | Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵Douwe Maan2018-03-125-8/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
| * | | | | | Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importingRubén Dávila2018-03-125-8/+5
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
* | | | | | Fix timestamp to include %M instead of %I for post-deploy migrations.ab-44121-post-deploy-migrations-time-formatAndreas Brandl2018-03-121-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | Closes #44121.
* | | | | Merge branch 'allow-ee-in-backtraces' into 'master'Robert Speicher2018-03-121-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Include the ee/ directory in backtraces Closes gitlab-ee#5204 See merge request gitlab-org/gitlab-ce!17664
| * | | | Include the ee/ directory in backtracesallow-ee-in-backtracesSean McGivern2018-03-121-0/+1
| | | | |
View Lorry Controller Status