summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use the new simpler `Pick into X.Y` labels workflow after the 7thdocs/support-release-tools-132Rémy Coutable2017-11-081-15/+23
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master'Rémy Coutable2017-11-085-28/+69
|\ | | | | | | | | | | | | Fix Error 500 when pushing LFS objects with a write deploy key Closes #39467 See merge request gitlab-org/gitlab-ce!15039
| * Fix Error 500 when pushing LFS objects with a write deploy keyStan Hu2017-11-085-28/+69
|/
* Merge branch 'update-upload-documentation' into 'master'Nick Thomas2017-11-082-10/+59
|\ | | | | | | | | Added file storage documentation and updated hash storage one See merge request gitlab-org/gitlab-ce!15269
| * Added file storage documentation and updated hash storage oneGabriel Mazetto2017-11-082-10/+59
| |
* | Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-0811-29/+16
|\ \ | | | | | | | | | | | | | | | | | | Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us Closes #34509 See merge request gitlab-org/gitlab-ce!15253
| * | Use Commit#notes and Note.for_commit_id when possible to make sure we use ↵dm-notes-for-commit-idDouwe Maan2017-11-0811-29/+16
| | | | | | | | | | | | all the indexes available to us
* | | Merge branch 'bvl-update-externalization-docs' into 'master'Achilleas Pipinellis2017-11-081-15/+12
|\ \ \ | | | | | | | | | | | | | | | | Make a note of which files to check in after externalizing strings See merge request gitlab-org/gitlab-ce!15207
| * | | Make a note of which files to check in after externalizing stringsbvl-update-externalization-docsBob Van Landuyt2017-11-081-15/+12
| | | |
* | | | Merge branch '38395-mr-widget-ci' into 'master'Phil Hughes2017-11-086-174/+204
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Merge request widget - CI information has different margins" Closes #38395 See merge request gitlab-org/gitlab-ce!15237
| * | | | Resolve "Merge request widget - CI information has different margins"Filipa Lacerda2017-11-086-174/+204
|/ / / /
* | | | Merge branch 'rc-fixup-mattermost-test-runner' into 'master'Grzegorz Bizon2017-11-081-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix test selection in Test::Integration::Mattermost See merge request gitlab-org/gitlab-ce!15278
| * | | | Fix test selection in Test::Integration::MattermostRichard Clamp2017-11-081-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ce3b81b953f we changed Test::Integration::Mattermost#perform to consume a required positional parameter and pass on the rest of the arguments to the superclass. There was an error in implementation here and instead of splatting the files array to produce no additional arguments, we passed in the default case an empty array. This had the effect of calling rspec with no test files, rather than expected default of 'qa/specs/features` Here we correct that bug, and re-add the :core suite, as that was a poor deuction in the investagtion for 74d6b8a211.
* | | | Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-08186-1294/+9142
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the GitHub importer to perform work in parallel and greatly improve performance Closes #33135, #38621, and #39361 See merge request gitlab-org/gitlab-ce!14731
| * | | | Replace old GH importer with the parallel importergithub-importer-refactorYorick Peterse2017-11-0731-1042/+23
| | | | |
| * | | | Rewrite the GitHub importer from scratchYorick Peterse2017-11-07154-244/+9004
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this MR there were two GitHub related importers: * Github::Import: the main importer used for GitHub projects * Gitlab::GithubImport: importer that's somewhat confusingly used for importing Gitea projects (apparently they have a compatible API) This MR renames the Gitea importer to Gitlab::LegacyGithubImport and introduces a new GitHub importer in the Gitlab::GithubImport namespace. This new GitHub importer uses Sidekiq for importing multiple resources in parallel, though it also has the ability to import data sequentially should this be necessary. The new code is spread across the following directories: * lib/gitlab/github_import: this directory contains most of the importer code such as the classes used for importing resources. * app/workers/gitlab/github_import: this directory contains the Sidekiq workers, most of which simply use the code from the directory above. * app/workers/concerns/gitlab/github_import: this directory provides a few modules that are included in every GitHub importer worker. == Stages The import work is divided into separate stages, with each stage importing a specific set of data. Stages will schedule the work that needs to be performed, followed by scheduling a job for the "AdvanceStageWorker" worker. This worker will periodically check if all work is completed and schedule the next stage if this is the case. If work is not yet completed this worker will reschedule itself. Using this approach we don't have to block threads by calling `sleep()`, as doing so for large projects could block the thread from doing any work for many hours. == Retrying Work Workers will reschedule themselves whenever necessary. For example, hitting the GitHub API's rate limit will result in jobs rescheduling themselves. These jobs are not processed until the rate limit has been reset. == User Lookups Part of the importing process involves looking up user details in the GitHub API so we can map them to GitLab users. The old importer used an in-memory cache, but this obviously doesn't work when the work is spread across different threads. The new importer uses a Redis cache and makes sure we only perform API/database calls if absolutely necessary. Frequently used keys are refreshed, and lookup misses are also cached; removing the need for performing API/database calls if we know we don't have the data we're looking for. == Performance & Models The new importer in various places uses raw INSERT statements (as generated by `Gitlab::Database.bulk_insert`) instead of using Rails models. This allows us to bypass any validations and callbacks, drastically reducing the number of SQL queries and Gitaly RPC calls necessary to import projects. To ensure the code produces valid data the corresponding tests check if the produced rows are valid according to the model validation rules.
| * | | | Cache feature names in RequestStoreYorick Peterse2017-11-072-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GitHub importer (and probably other parts of our code) ends up calling Feature.persisted? many times (via Gitaly). By storing this data in RequestStore we can save ourselves _a lot_ of database queries. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39361
| * | | | Add returning IDs to Gitlab::Database.bulk_insertYorick Peterse2017-11-072-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the keyword argument "return_ids" to Gitlab::Database.bulk_insert. When set to `true` (and PostgreSQL is used) this method will return an Array of the IDs of the inserted rows, otherwise it will return an empty Array.
| * | | | Refactor User.find_by_any_emailYorick Peterse2017-11-072-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using SQL::Union we can return a proper ActiveRecord::Relation, making it possible to select the columns we're interested in (instead of all of them).
* | | | | Merge branch 'jivl-add-missing-strings-tag-page' into 'master'Tim Zallmann2017-11-081-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added missing strings to prepare the tags page for internationalization See merge request gitlab-org/gitlab-ce!15256
| * | | | | Added missing strings to prepare the tags page for internationalizationjivl-add-missing-strings-tag-pageJose Ivan Vargas2017-11-071-3/+3
| | | | | |
* | | | | | Merge branch 'qa/gb/add-qa-internal-tests-to-the-pipeline' into 'master'Rémy Coutable2017-11-081-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Internal QA specs to the pipeline See merge request gitlab-org/gitlab-ce!15240
| * | | | | | Add Internal QA specs to the pipelineGrzegorz Bizon2017-11-081-0/+10
|/ / / / / /
* | | | | | Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-086-16/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Sign Out route from a DELETE to a GET Closes #39708 See merge request gitlab-org/gitlab-ce!15231
| * | | | | | Updates tests to reflect sign_out route changeJoe Marty2017-11-073-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also remove sign_out DELETE route from read-only whitelist routes
| * | | | | | Change Sign Out route from a DELETE to a GETJoe Marty2017-11-063-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #39708
* | | | | | | Merge branch 'fl-cleanup-test' into 'master'Tim Zallmann2017-11-081-23/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup tests See merge request gitlab-org/gitlab-ce!15261
| * | | | | | | Update mr_widget_options_spec.jsfl-cleanup-testFilipa Lacerda2017-11-071-1/+0
| | | | | | | |
| * | | | | | | Cleanup testsFilipa Lacerda2017-11-071-22/+0
| | | | | | | |
* | | | | | | | Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan2017-11-083-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting merged branches, ignore protected tags Closes #39732 See merge request gitlab-org/gitlab-ce!15252
| * | | | | | | | When deleting merged branches, ignore protected tagstc-delete-merged-protected-tags-fixToon Claes2017-11-073-1/+14
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ce!13251 wildcard Protected Branches were handled properly when deleting all merged branches. But this fix wasn't that good. It also checked branch names against Protected Tags. That's not correct. This change will **only** check if there is a Protected Branch matching the merged branch, and ignores Protected Tags. Closes gitlab-org/gitlab-ce#39732.
* | | | | | | | Merge branch 'bvl-free-paths' into 'master'Douwe Maan2017-11-0810-111/+205
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free some reserved group routes See merge request gitlab-org/gitlab-ce!15052
| * | | | | | | | Remove EE-specific group pathsbvl-free-pathsBob Van Landuyt2017-11-072-19/+3
| | | | | | | | |
| * | | | | | | | Check redirecting with a querystringBob Van Landuyt2017-11-072-2/+14
| | | | | | | | |
| * | | | | | | | Update failure message when finding new routes in `PathRegex`Bob Van Landuyt2017-11-071-9/+4
| | | | | | | | |
| * | | | | | | | Free up some group reserved wordsBob Van Landuyt2017-11-077-61/+100
| | | | | | | | |
| * | | | | | | | Free up `avatar`, `group_members` and `milestones` as pathsBob Van Landuyt2017-11-075-73/+87
| | | | | | | | |
| * | | | | | | | Free up `labels` as a group nameBob Van Landuyt2017-11-073-5/+28
| | | | | | | | |
| * | | | | | | | Add helper methods to redirect legacy pathsBob Van Landuyt2017-11-073-0/+27
| | | | | | | | |
* | | | | | | | | Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into ↵Stan Hu2017-11-082-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Make BackgroundTransaction#labels public See merge request gitlab-org/gitlab-ce!15257
| * | | | | | | | | Make BackgroundTransaction#labels publicPawel Chojnacki2017-11-072-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as are all other Transaction implementations
* | | | | | | | | | Merge branch 'jivl-fix-karma-config-file' into 'master'Mike Greiling2017-11-081-9/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix karma config file See merge request gitlab-org/gitlab-ce!15263
| * | | | | | | | | | fix karma config filejivl-fix-karma-config-fileJose Ivan Vargas2017-11-071-9/+0
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ux-guide-components-modal' into 'master'Marcia Ramos2017-11-085-0/+33
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modals in UX guide See merge request gitlab-org/gitlab-ce!14886
| * | | | | | | | | Changed the order of buttons from left to rightux-guide-components-modalHazel2017-11-061-1/+2
| | | | | | | | | |
| * | | | | | | | | Modify the sentences and add TodoHazel2017-11-021-2/+4
| | | | | | | | | |
| * | | | | | | | | Modified the font family in the imagesHazel2017-10-186-1/+1
| | | | | | | | | |
| * | | | | | | | | Updated the sytle part - changed the order of header, body, and actionsHazel2017-10-171-3/+3
| | | | | | | | | |
| * | | | | | | | | Updated the content and added the imagesHazel2017-10-176-11/+12
| | | | | | | | | |
| * | | | | | | | | Modified the copyHazel2017-10-161-1/+1
| | | | | | | | | |