summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-error-msg-typo' into 'master'Nick Thomas2019-03-091-1/+1
|\ | | | | | | | | Update cleanup.rake to fix a typo in the error message See merge request gitlab-org/gitlab-ce!25901
| * Update cleanup.rake to fix a typo in the error messageRay Paik2019-03-071-1/+1
| |
* | Merge branch '58649-project-template-for-android' into 'master'Sean McGivern2019-03-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Project template for Android" Closes #58649 See merge request gitlab-org/gitlab-ce!25870
| * | Add Android templateJason Lenny2019-03-071-0/+1
| |/
* | Use vendored templates for Sec ProductsVictor Zagorodny2019-03-085-3/+178
| | | | | | | | Update Dependency Scanning and add other templates
* | Provide EE backports for filtering by approver featureIgor2019-03-072-0/+18
|/ | | | | Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
* Resolve "Project template for iOS"Jason Lenny2019-03-071-0/+1
|
* Merge branch 'incremental-backups' into 'master'Stan Hu2019-03-074-4/+17
|\ | | | | | | | | Incremental backups See merge request gitlab-org/gitlab-ce!24035
| * trim empty lineFrederic Van Espen2019-03-071-1/+0
| |
| * Merge branch 'master' into incremental-backupsFrederic Van Espen2019-03-07357-1553/+6506
| |\
| * | fix option testFrederic Van Espen2019-03-071-1/+1
| | |
| * | introduce optional rsyncable flagFrederic Van Espen2019-03-073-3/+13
| | |
| * | fix code styleFrederic Van Espen2018-12-271-5/+5
| | |
| * | set the --rsyncable option for gzipFrederic Van Espen2018-12-262-3/+3
| | |
| * | Allow to override part of the backup filenameFrederic Van Espen2018-12-261-1/+5
| | |
* | | Adding additional usage metrics for Release to weekly pingDarby Frey2019-03-071-0/+2
| | |
* | | Merge branch 'sh-rugged-get-tree-entry' into 'master'Sean McGivern2019-03-072-0/+112
|\ \ \ | | | | | | | | | | | | | | | | Bring back Rugged implementation of TreeEntry See merge request gitlab-org/gitlab-ce!25706
| * | | Fix return nil Rubocop offensesStan Hu2019-03-071-3/+3
| | | |
| * | | Bring back Rugged implementation of TreeEntryStan Hu2019-03-072-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back some of the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20099/diffs For users using Gitaly on top of NFS, accessing the Git data directly via Rugged is more performant than Gitaly. This merge request introduces the feature flag `rugged_tree_entry` to activate the Rugged method. Part of four Rugged changes identified in https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.
* | | | Merge branch 'sh-rugged-tree-entries' into 'master'Sean McGivern2019-03-073-0/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bring back Rugged implementation of GetTreeEntries See merge request gitlab-org/gitlab-ce!25674
| * | | | Remove unnecessary return statements in tree.rbStan Hu2019-03-071-2/+2
| |/ / /
| * | | Remove old code in TreeHelper#flatten_treeStan Hu2019-03-071-3/+5
| | | |
| * | | Bring back Rugged implementation of GetTreeEntriesStan Hu2019-03-073-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back some of the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20343. For users using Gitaly on top of NFS, accessing the Git data directly via Rugged is more performant than Gitaly. This merge request introduces the feature flag `rugged_tree_entries` to activate the Rugged method. Part of four Rugged changes identified in https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.
* | | | Revert "Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'"Igor2019-03-072-18/+0
| | | | | | | | | | | | | | | | This reverts merge request !24982
* | | | Merge branch 'fix-sidekiq-process-group-killing' into 'master'Stan Hu2019-03-071-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Sidekiq process group killing See merge request gitlab-org/gitlab-ce!25866
| * | | | Fix Sidekiq process group killingNick Thomas2019-03-071-2/+5
| | | | |
* | | | | Merge branch '56937-edit-knative-domain' into 'master'Grzegorz Bizon2019-03-071-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Edit Knative domain after it has been deployed Closes #56937 See merge request gitlab-org/gitlab-ce!25386
| * | | | Creates Clusterss::ApplciationsController update endpointJoão Cunha2019-03-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Creates new route - Creates new controller action - Creates call stack: Clusterss::ApplciationsController calls --> Clusters::Applications::UpdateService calls --> Clusters::Applications::ScheduleUpdateService calls --> ClusterUpdateAppWorker calls --> Clusters::Applications::PatchService --> ClusterWaitForAppInstallationWorker DRY req params Adds gcp_cluster:cluster_update_app queue Schedule_update_service is uneeded Extract common logic to a parent class (UpdateService will need it) Introduce new UpdateService Fix rescue class namespace Fix RuboCop offenses Adds BaseService for create and update services Remove request_handler code duplication Fixes update command Move update_command to ApplicationCore so all apps can use it Adds tests for Knative update_command Adds specs for PatchService Raise error if update receives an unistalled app Adds update_service spec Fix RuboCop offense Use subject in favor of go Adds update endpoint specs for project namespace Adds update endpoint specs for group namespace
* | | | | Merge branch 'sh-rugged-commit-is-ancestor' into 'master'Douwe Maan2019-03-072-2/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bring back Rugged implementation of CommitIsAncestor See merge request gitlab-org/gitlab-ce!25702
| * | | | | Bring back Rugged implementation of CommitIsAncestorStan Hu2019-03-042-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back some of the changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20095. For users using Gitaly on top of NFS, accessing the Git data directly via Rugged is more performant than Gitaly. This merge request introduces the feature flag `rugged_commit_is_ancestor` to activate the Rugged path. Part of four Rugged changes identified in https://gitlab.com/gitlab-org/gitlab-ce/issues/57317.
* | | | | | Merge branch 'expand-diff-to-full-file' into 'master'Douwe Maan2019-03-072-14/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand diff to entire file Closes #19054 See merge request gitlab-org/gitlab-ce!24406
| * | | | | | Add option to expand diff to full filePhil Hughes2019-03-061-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user can also toggle between the diff changes and the full file diff. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19054
| * | | | | | Add full option for blob diff actionMark Chao2019-03-061-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns all diff lines for frontend if full is true. Turn UnfoldForm into presenter, and move controller logic to presenter.
* | | | | | | Merge branch 'gt-update-activity-filter-for-issues' into 'master'Douwe Maan2019-03-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update activity filter for issues Closes #53334 See merge request gitlab-org/gitlab-ce!23423
| * | | | | | | Add hard coded event type filterGeorge Tsiolis2019-03-071-1/+1
| | | | | | | |
| * | | | | | | Update activity filter for issuesGeorge Tsiolis2019-03-071-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sh-optimize-todos-api' into 'master'Sean McGivern2019-03-074-4/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Significantly reduce N+1 queries in /api/v4/todos endpoint Closes #40378 See merge request gitlab-org/gitlab-ce!25711
| * | | | | | Significantly reduce N+1 queries in /api/v4/todos endpointStan Hu2019-03-064-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By preloading associations and batching issuable metadata lookups, we can significantly cut the number of SQL queries needed to load the Todos API endpoint. On GitLab.com, my own tests showed my user's SQL queries went from 365 to under 60 SQL queries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40378
* | | | | | | Merge branch '58613-protected-branches-error' into 'master'Lin Jen-Shin2019-03-071-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow protected branch creation for empty project Closes #58613 See merge request gitlab-org/gitlab-ce!25834
| * | | | | | | Move empty_repo check on its own58613-protected-branches-errorPatrick Bajao2019-03-071-1/+3
| | | | | | | |
| * | | | | | | Allow protected branch creation for empty projectPatrick Bajao2019-03-071-1/+1
| | | | | | | |
* | | | | | | | Moved all emojis to the public folderTim Zallmann2019-03-071-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created new emojis map in public folder Renamed folder to emojis Loading now the emojis from Localstorage or from Server Moved all emojis to the public folder Loading the emojis.json file now through AJAX Loads now the map in the web element instead when building the emoji tag Updated the custom Element Setup to modern method Fixed Emoji Karma Specs for async loading Loading now the emojis from Localstorage or from Server Loads now the map in the web element instead when building the emoji tag Fixed problem with FIXTURE_PATH for emojis fixtures Fixes Linting Error in gemojione.rake Fixed Emoji Karma Specs Fix static type check in gemojione and check if already registered Testing if the Emoji Support Check is failing Rspec Change of CLass Name, returning true on check to test Fixes failing Emoji RSpec Tests Moved Emojis into public/-/emojis/1/ Fixed Linting Errors in gl_emoji Fix to fixtures creation for emojis Fixed path spec for new subdirectory -/emojis Optimized emojis.json output Fix for Emoji Spec failure due to unicode dataset Better catch handling for emojis
* | | | | | | | Add Dependency Scanning vendored template for EEVictor Zagorodny2019-03-072-5/+44
| | | | | | | |
* | | | | | | | Merge branch 'auto-devops-tags' into 'master'Grzegorz Bizon2019-03-071-2/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Auto DevOps build job for tags See merge request gitlab-org/gitlab-ce!25718
| * | | | | | | | Add performance, dast, and review jobs to tags pipelinewalkafwalka2019-03-031-0/+4
| | | | | | | | |
| * | | | | | | | Add build for tagswalkafwalka2019-03-031-2/+14
| | | | | | | | |
* | | | | | | | | Merge branch 'jc-feature-flag-find-all-tags' into 'master'Lin Jen-Shin2019-03-071-2/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature flag for FindAllTags See merge request gitlab-org/gitlab-ce!25615
| * | | | | | | | | Check that feature database and table exists for gitaly featuresjc-feature-flag-find-all-tagsJohn Cai2019-03-061-1/+3
| | | | | | | | | |
| * | | | | | | | | Add feature flag for FindAllTagsJohn Cai2019-03-051-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Provide EE backports for filtering by approver featureIgor2019-03-072-0/+18
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files