Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2018-11-05Start tracking shards in the databaseNick Thomas
2018-11-02Merge branch 'top_level_clusters_controller' into 'master'Kamil Trzciński
Top level clusters controller See merge request gitlab-org/gitlab-ce!22438
2018-11-02Add documentation for tls gitalyAhmad Hassan
2018-11-02Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik
2018-11-02Merge branch 'security-kubeclient-ssrf' into 'master'Jan Provaznik
[master] Security kubeclient ssrf See merge request gitlab/gitlabhq!2575
2018-11-02Merge branch 'sh-fix-generators-not-always-working' into 'master'Robert Speicher
Fix "rails g migration" not always using migration templates Closes #52651 See merge request gitlab-org/gitlab-ce!22592
2018-11-01Add documentation, secure routes, etcAndrew Newdigate
2018-11-01Leak memory, spin cpu and kill the processAndrew Newdigate
2018-11-01Adding chaos to GitLab through chaos endpointsAndrew Newdigate
2018-11-01Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis
Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
2018-11-01Fix typos in comments and specsGeorge Tsiolis
2018-11-01Resolve controller sharing concernThong Kuah
Use ClustersController as base while having Projects::ClustersController to inform what `clusterable` is. Thanks @ayufan for the great suggestion ! - View changes to work with new approach - Fix javascript for new approach - Fix feature specs for new approach - Fix QA
2018-11-01Abstract out project out of ClustersControllerThong Kuah
To the extent possible swap out `project` with `clusterable` - Abstract paths for showing cluster or clusters. This will allow us to swap in alternative paths for group level cluster - Push :project_id and :namespace_id params from the URL to the POST body. - Create a nice helper for to generate links for the destroy action For some reason, spec :project_id and :namespace_id param are not going through `to_param` for a JSON format. Manually call `to_param` to fix specs. - Move :layout to BaseController
2018-11-01Convert clusters to use a top-level controllerThong Kuah
In preparation so that we can create both cluster attached to project and cluster attached to group. - Move ClustersController to top level - Move Clusters::ApplicationsController to top-level too - Creates a Clusters::BaseController to share common functions - Do not rely on @project ivar. Anything could set the ivar. - Fix Vue page components due to new data-page value Because of the controller change we have gone from `projects:clusters:new` to `clusters:new`, so we need to update the file location of the page components. There is somewhere a function that will convert data-page to a file location. On that note, projects/clusters/gcp/new/, translate to Projects::Clusters::Gcp#new doesn't exist so replace that with clusters/create_gcp/ and clusters/create_user/
2018-10-31Rename @gitlab-org/gitlab-svgs to @gitlab/svgsLukas Eipert
2018-10-31Add more specsAhmad Hassan
2018-10-30Resolve "Create new group: Rename form fields and update UI"Martin Wortschack
2018-10-30Support tls communication in gitalyAhmad Hassan
2018-10-30Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney
2018-10-30Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan
Make new merge request URL more friendly when pushing code Closes #53012 See merge request gitlab-org/gitlab-ce!22526
2018-10-29Merge branch 'sh-fix-hipchat-ssrf' into 'master'Jan Provaznik
[master] Prevent SSRF attacks in HipChat integration See merge request gitlab/gitlabhq!2530
2018-10-27Backport CE route changes for Ops Dashboard in EEPeter Leitzen
2018-10-26Monkey kubeclient to not follow any redirects.Thong Kuah
This should prevent any malicious server from responding with a location that will redirect us and expose internal services, as kubeclient's rest-client will no longer follow redirects.
2018-10-26Extract EE only oauth routes and add testsLin Jen-Shin
2018-10-26Put EE routes in EE files under EE directoriesLin Jen-Shin
2018-10-26Fix specsblackst0ne
2018-10-26Update other linksblackst0ne
2018-10-26Merge branch 'an-multithreading' into 'master'Robert Speicher
Puma in GDK and rack server lifecycle event abstractions Closes #52762 See merge request gitlab-org/gitlab-ce!22372
2018-10-26Fix "rails g migration" not always using migration templatesStan Hu
Normally, this is what's supposed to happen when you invoke `rails g generate migration`: 1. `Rails.application.load_generators` is called here: https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/commands/commands_tasks.rb#L129 2. This loads the local `generator_templates` path in https://github.com/rails/rails/blob/v4.2.10/railties/lib/rails/generators.rb#L69. However, when metrics are enabled, the application is eager loaded here in the initializer. This short-circuits the `load_generators` and loads `ActiveRecord::Generators::MigrationGenerator` automatically, so the custom path is never loaded properly. With this change, we skip the initializing of metrics and eager loading if generators are in use. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52651
2018-10-25Remove asset_sync gem and related codeBalasankar "Balu" C
Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15734 . We are not using asset sync currently.
2018-10-25Add experimental support for PumaAndrew Newdigate
This allows us (and others) to test drive Puma without it affecting all users. Puma can be enabled by setting the environment variable "EXPERIMENTAL_PUMA" to a non empty value.
2018-10-25Backport SSH host key detection code to CENick Thomas
This functionality is needed for SSH push mirroring support, which is a CE feature.
2018-10-23Remove broken git storage for testingZeger-Jan van de Weg
Broken storage used to be used to test situations where the Git storage wasn't being reached. These days we can just mock the Gitaly response. But given the broken storage is removed now, Gitaly can take over control of the storage being reachable. If it's not, Gitaly won't boot. That's nice for situations where a disk wasn't mounted for instance. Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675
2018-10-23Make new merge request URL more friendly when pushing codeblackst0ne
2018-10-19Allow to configure cache path for webpackKamil Trzciński
2018-10-15Merge branch 'sh-remove-koding' into 'master'Douwe Maan
Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
2018-10-13Remove Koding integration and documentationStan Hu
This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
2018-10-12Fix rubocop complaining about unicorn.rbBrett Walker
2018-10-10Remove Git circuit breakerZeger-Jan van de Weg
Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
2018-10-05Add packages section to CE config fileDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-10-05Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda
2018-10-05Make GitLab pages support access controlTuomo Ala-Vannesluoma
2018-10-05Resolve "Drop down filter for project snippets"Fabian Schneider
2018-10-05Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda
2018-10-04Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas
Add reliable sidekiq fetcher See merge request gitlab-org/gitlab-ce!21715
2018-10-04Merge branch 'fix-todo-cops' into 'master'Rémy Coutable
Fix todo cops See merge request gitlab-org/gitlab-ce!21850
2018-10-04Merge branch '41922-simplify-runner-registration-token-resetting' into 'master'Kamil Trzciński
Simplify runner registration token resetting Closes #41922 See merge request gitlab-org/gitlab-ce!21658
2018-10-04Resolve "Add new "Overview" tab on user profile page"Martin Wortschack
2018-10-04Simplify runner registration token resettingTomasz Maczukin
This icommit adds several changes related to the same topic - resetting a Runner registration token: 1. On Project settings page it adds a button for resetting the registration token and it removes the Runner token field that was confusing all GitLab users. 2. On Group settings page it adds the same button for resetting the registration token. 3. On Admin Runners settings page it moves the button to the same place as in Project and Group settings and it changes slightly the page layout to make it more similar to Group and Project setting pages. 4. It refactorizes a little the partial that prints runner registration description. Thanks to this Project, Group and Admin settings of the Runner are re-using the same code to generate the button. 5. Updates the translations of changed text.
2018-10-04Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda