summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Remove translation dependency in CA specLuke Bennett2019-03-071-19/+0
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-rugged-get-tree-entry' into 'master'Sean McGivern2019-03-074-1/+132
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-074-1/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'jest-docs' into 'master'Mike Lewis2019-03-071-8/+52
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add jest to frontend_testing docs See merge request gitlab-org/gitlab-ce!25748
| * | | | | | | | | Apply suggestion to doc/development/testing_guide/frontend_testing.mdLuke Bennett2019-03-071-1/+1
| | | | | | | | | |
| * | | | | | | | | Add jest to frontend_testing docsLuke Bennett2019-03-041-8/+52
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dz-patch-48' into 'master'Lin Jen-Shin2019-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update packages comment in gitlab.yml.example [ci skip] See merge request gitlab-org/gitlab-ce!25877
| * | | | | | | | | | Update packages comment in gitlab.yml.example [ci skip]Dmitriy Zaporozhets2019-03-071-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ce-extract-ee-specific-code-for-spec/support' into 'master'Dmitriy Zaporozhets2019-03-079-87/+138
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Extract EE specific code for spec/support See merge request gitlab-org/gitlab-ce!25569
| * | | | | | | | | | Reduce differences in spec/support/shared_contexts/services_shared_context.rbRémy Coutable2019-03-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Reduce differences in spec/support/webmock.rbRémy Coutable2019-03-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Reduce differences in spec/support/matchers/access_matchers.rbRémy Coutable2019-03-071-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Reduce differences in spec/support/helpers/kubernetes_helpers.rbRémy Coutable2019-03-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Reduce differences in spec/support/helpers/javascript_fixtures_helpers.rbRémy Coutable2019-03-072-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Reduce differences in spec/support/db_cleaner.rbRémy Coutable2019-03-072-45/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Reduce differences in spec/support/api/schema_matcher.rbRémy Coutable2019-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | Merge branch 'sh-rugged-tree-entries' into 'master'Sean McGivern2019-03-076-15/+191
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-13/+6
| | | | | | | | | | |
| * | | | | | | | | | Bring back Rugged implementation of GetTreeEntriesStan Hu2019-03-075-5/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | Merge branch 'restrict-jupyter-login' into 'master'Dmitriy Zaporozhets2019-03-074-8/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project whitelist for JupyterHub deployment See merge request gitlab-org/gitlab-ce!25684
| * | | | | | | | | | | Merge branch 'restrict-jupyter-login' of ↵Amit Rathi2019-03-074-8/+19
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/amit1rrr/gitlab-ce into restrict-jupyter-login
* | | | | | | | | | | Merge branch 'revert-fee665e6' into 'master'Filipa Lacerda2019-03-0716-713/+600
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'" See merge request gitlab-org/gitlab-ce!25850
| * | | | | | | | | | | Revert "Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'"Igor2019-03-0716-713/+600
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !24982
* | | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2019-03-0741-5598/+24438
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port translations from EE See merge request gitlab-org/gitlab-ce!25863
| * | | | | | | | | | | Port translations from EEGitLab Crowdin Bot2019-03-0741-5598/+24438
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-blob-editor-deleting-content' into 'master'Filipa Lacerda2019-03-073-1/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the blob editor deleting all content for files Closes #58578 See merge request gitlab-org/gitlab-ce!25865
| * | | | | | | | | | | | Fixed the blob editor deleting all content for filesPhil Hughes2019-03-073-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only happens for files that the path consists of only numbers Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58578
* | | | | | | | | | | | | Merge branch 'eb-update-cycle-analytics-docs' into 'master'Kushal Pandya2019-03-074-25/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Cycle Analytics Documentation See merge request gitlab-org/gitlab-ce!25536
| * | | | | | | | | | | | Update Cycle Analytics documentationEric Brinkman2019-03-074-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate info. Update pipeline health to cycle analytics. Updated screenshots.
* | | | | | | | | | | | | Merge branch 'fix-sidekiq-process-group-killing' into 'master'Stan Hu2019-03-072-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sidekiq process group killing See merge request gitlab-org/gitlab-ce!25866
| * | | | | | | | | | | | | Fix Sidekiq process group killingNick Thomas2019-03-072-3/+6
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '56937-edit-knative-domain' into 'master'Grzegorz Bizon2019-03-0735-300/+958
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit Knative domain after it has been deployed Closes #56937 See merge request gitlab-org/gitlab-ce!25386
| * | | | | | | | | | | | | | Don't use sleep in feature specsJoão Cunha2019-03-061-25/+8
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove unecessary begin..end blockJoão Cunha2019-03-062-24/+20
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use tap command for better readabilityJoão Cunha2019-03-061-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Rename ClusterUpdateAppWorker to ClusterPatchAppWorkerJoão Cunha2019-03-057-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This is to avoid colision with EE ClusterUpdateAppWorker
| * | | | | | | | | | | | | | Fix rubocop offensesJoão Cunha2019-03-051-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adds Knative udpate feature specsJoão Cunha2019-03-051-8/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - specs for clicking Install button - specs for clicking Save changes button
| * | | | | | | | | | | | | | Sends update route to the clientJoão Cunha2019-03-056-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - extends presenters to include update endpoint path - sends path to the client on clusters clusters show view.
| * | | | | | | | | | | | | | Creates Clusterss::ApplciationsController update endpointJoão Cunha2019-03-0516-104/+569
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | | | | | | | | | | | Add ability to edit Knative domainjerasmus2019-03-0511-168/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the functionality to edit the Knative domain
* | | | | | | | | | | | | | | Merge branch 'patch-47' into 'master'Marcia Ramos2019-03-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing quote in Wildcard domains section See merge request gitlab-org/gitlab-ce!25773
| * | | | | | | | | | | | | | | Fix missing quoteMartin Melka2019-03-051-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'winh-enable-reply_to_individual_notes' into 'master'Grzegorz Bizon2019-03-077-7/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable reply_to_individual_notes feature flag by default Closes #30299 See merge request gitlab-org/gitlab-ce!25575
| * | | | | | | | | | | | | | | Add current state of docsWinnie Hellmann2019-03-063-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | copied from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25633
| * | | | | | | | | | | | | | | Enable reply_to_individual_notes feature flag by defaultWinnie Hellmann2019-03-064-5/+9
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '47869-jobs-tab-border-top-in-pipeline-s-page-is-1px-off' into ↵Annabel Dunstone Gray2019-03-073-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Jobs tab border top in pipeline's page is 1px off" Closes #47869 See merge request gitlab-org/gitlab-ce!24878
| * | | | | | | | | | | | | | | | Resolve "Jobs tab border top in pipeline's page is 1px off"Miranda Fluharty2019-03-073-5/+11
|/ / / / / / / / / / / / / / / /