summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Use flexbox instead of bootstrap columns3615-improve-welcome-screenAnnabel Dunstone Gray2017-11-084-86/+97
|
* Add new icon; update contentAnnabel Dunstone Gray2017-11-083-3/+4
|
* Add four blocks to each welcome pageAnnabel Dunstone Gray2017-11-082-10/+28
|
* Update new project iconAnnabel Dunstone Gray2017-11-081-1/+1
|
* Add mobile stylesAnnabel Dunstone Gray2017-11-081-4/+15
|
* Reorganize landing page for new usersAnnabel Dunstone Gray2017-11-084-94/+115
|
* Fix Error 500 when pushing LFS objects with a write deploy keyStan Hu2017-11-081-1/+2
|
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-088-27/+8
|\ | | | | | | | | | | | | 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-088-27/+8
| | | | | | | | all the indexes available to us
* | Resolve "Merge request widget - CI information has different margins"Filipa Lacerda2017-11-084-92/+109
| |
* | Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-0823-15/+670
|\ \ | | | | | | | | | | | | | | | | | | 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-071-4/+4
| | |
| * | Rewrite the GitHub importer from scratchYorick Peterse2017-11-0723-6/+661
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Refactor User.find_by_any_emailYorick Peterse2017-11-071-9/+9
| | | | | | | | | | | | | | | | | | 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 'feature-change-signout-route' into 'master'Douwe Maan2017-11-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Sign Out route from a DELETE to a GET Closes #39708 See merge request gitlab-org/gitlab-ce!15231
| * | | | Change Sign Out route from a DELETE to a GETJoe Marty2017-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #39708
* | | | | Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan2017-11-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '37824-many-branches-lock-server' into 'master'Annabel Dunstone Gray2017-11-076-24/+81
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812
| * | | | Remove truncate mixinAnnabel Dunstone Gray2017-11-071-1/+0
| | | | |
| * | | | Change cursor to pointer on hovertauriedavis2017-11-071-0/+1
| | | | |
| * | | | Simplify design for no tags, branchestauriedavis2017-11-071-17/+4
| | | | |
| * | | | Addresses frontend comments.37824-many-branches-lock-serverMayra Cabrera2017-11-071-6/+6
| | | | | | | | | | | | | | | | | | | | Make small improvements over well.css files
| * | | | Ensure enough space between branch linksMayra Cabrera2017-11-072-1/+5
| | | | |
| * | | | Update CSS to use flexbox for branch and tag labelskushalpandya2017-11-071-8/+8
| | | | |
| * | | | Address discussions on the MEMayra Cabrera2017-11-073-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes thinner right border on the limit box - Adds and 'elsif' on @branches for the scenario in which a commit is not related to a branch - Fixes small details on limit_exceeded_for_message partial
| * | | | Addresses front & backend commentsMayra Cabrera2017-11-063-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | - Improves CSS files by reusing existing code - Changes logic in views to avoid future problems in translations
| * | | | Modifies commit branches sectionMayra Cabrera2017-11-063-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Display the default branch (if the limit is not exceeded) - Requires '...' to be clicked before showing the rest of the branches and/or tags - Fixes haml lints
| * | | | Add styles for branch & tags boxesMayra Cabrera2017-11-025-19/+53
| | | | | | | | | | | | | | | | | | | | | | | | | - Create a partial for limit exceeded message - Modifies specs to adjust new scenarios
| * | | | Add UI/UX improvementsMayra Cabrera2017-11-012-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | - Leave 'too many tags to search' always visible - Add different message to the branch/tags so it states its unavailable
| * | | | optimize branching logicBrett Walker2017-10-171-6/+5
| | | | |
| * | | | implemented using an ivar, and added specsBrett Walker2017-10-132-7/+12
| | | | |
| * | | | moved throttling into the controller. if we hit the throttlingBrett Walker2017-10-124-26/+43
| | | | | | | | | | | | | | | | | | | | threshhold, a message is shown indicating we didn't perform the search
| * | | | if the branch/tag count is over a certain limit, don't executeBrett Walker2017-10-112-6/+6
| | | | | | | | | | | | | | | | | | | | the long running git query
* | | | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-11-076-21/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications
| * \ \ \ \ Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński2017-11-0730-132/+970
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for k8s cluster applications - Helm tiller installation See merge request gitlab-org/gitlab-ce!14908
| * \ \ \ \ \ Merge branch '39798-revert-gear-animation' into 'master'Clement Ho2017-11-072-18/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Auto DevOps gear animation Closes #39798 See merge request gitlab-org/gitlab-ce!15232
| | * | | | | Revert Autodevops gear animation39798-revert-gear-animationEric Eastwood2017-11-062-18/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39798
| * | | | | | Merge branch 'multi-file-editor-table-cells-width' into 'master'Filipa Lacerda2017-11-074-3/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed multi-file editor table cells content width jumping See merge request gitlab-org/gitlab-ce!15245
| | * | | | | | Fixed multi-file editor table cells content width jumpingmulti-file-editor-table-cells-widthPhil Hughes2017-11-074-3/+10
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Kamil Trzcinski2017-11-0737-193/+373
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | into add-ingress-to-cluster-applications
| * | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0837-193/+373
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'Tim Zallmann2017-11-071-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit pipeline showing wrong status Closes #39878 See merge request gitlab-org/gitlab-ce!15238
| | | * | | | | Fix commit pipeline showing wrong status39878-commit-pipeline-reads-wrong-keyFilipa Lacerda2017-11-071-1/+1
| | | | | | | |
| | * | | | | | Merge branch '38394-smarter-interval' into 'master'Filipa Lacerda2017-11-072-11/+27
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't re-run smart interval callback if there is already one in progress Closes #38394 See merge request gitlab-org/gitlab-ce!15032
| | | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-07135-983/+1248
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval
| | | * | | | | | | update changelogSimon Knox2017-11-071-1/+1
| | | | | | | | | |
| | | * | | | | | | fix line lintSimon Knox2017-11-061-1/+2
| | | | | | | | | |