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
2017-08-16Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher
Only create commit GPG signature when necessary See merge request !13561
2017-08-16Only create commit GPG signature when necessaryDouwe Maan
2017-08-16Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable
Circuitbreaker settings to avoid spec-failures Closes #36324 See merge request !13519
2017-08-16Use better higher threshold settings for storage access in testsBob Van Landuyt
`failure_count_threshold`: We should never need this, but we don't want to block access in tests because of this. `failure_wait_time`: Setting it to 0 now allows each storage attempt `storage_timeout`: Try a bit longer to access storage on CI in case the slow machines take a bit longer to spin up the process to perfom the check
2017-08-16Allow a `failure_wait_time` of 0 for storage accessBob Van Landuyt
This allows testing every storage attempt after a failure. Which could be useful for tests
2017-08-16Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable
Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
2017-08-16Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable
Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
2017-08-15Merge branch '36405-fix-mysql-timestamp-columns' into 'master'Stan Hu
Make sure MySQL would not use CURRENT_TIMESTAMP as the default for timestamp columns Closes #36405 See merge request !13560
2017-08-15Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher
2017-08-15Merge branch '36152-enable-scope-hoisting-with-webpack' into 'master'Jacob Schatz
Resolve "Enable scope hoisting with webpack" Closes #36152 See merge request !13374
2017-08-15Make sure MySQL would not use CURRENT_TIMESTAMPLin Jen-Shin
for timestamp columns magically. See: https://gitlab.com/gitlab-org/gitlab-ce/issues/36405
2017-08-15enable webpack scope hoistingMike Greiling
2017-08-14Improve Prometheus docs, include nginx ingressJoshua Lambert
2017-08-14Whitelist or fix additional `Gitlab/PublicSend` cop violationsRobert Speicher
An upcoming update to rubocop-gitlab-security added additional violations.
2017-08-11Make sure uploads for personal snippets are correctly renderedBob Van Landuyt
2017-08-10alternative route for download archivehaseeb
2017-08-09Enable the Layout/SpaceBeforeBlockBraces copRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-08Re-enable SqlInjection and CommandInjectionBrian Neel
2017-08-08Merge branch 'master' into ideMike Greiling
* master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
2017-08-08Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu
Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
2017-08-08Merge branch '32844-issuables-performance' into 'master'Sean McGivern
Issuables: Move some code from create services to Sidekiq workers See merge request !13326
2017-08-07Merge branch 'master' into ideMike Greiling
* master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ...
2017-08-07Merge branch '33902-upgrade-to-webpack-v3' into 'master'Jacob Schatz
Upgrade to webpack v3.4.0 Closes #33902 See merge request !12298
2017-08-07Merge branch 'zj-project-templates' into 'master'Sean McGivern
Allow projects to be started from a template Closes #32420 See merge request !13108
2017-08-07Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher
Support group milestone references Closes #34778 See merge request !13289
2017-08-07Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira
2017-08-07Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki
2017-08-07add thunky to approved licenses (MIT)Mike Greiling
2017-08-07add disableHostCheck to devServer config since webpack dev server is proxiedMike Greiling
2017-08-07replace stats-webpack-plugin with webpack-stats-pluginMike Greiling
2017-08-07Move some after_create parts to worker to improve performanceJarka Kadlecova
2017-08-07Support references to group milestonesSean McGivern
Group milestones can only be referred to by name, not IID. They also do not support cross-project references.
2017-08-07Merge branch 'master' into zj-project-templatesFilipa Lacerda
* master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
2017-08-07Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan
# Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
2017-08-07Fix issues with pdf-js dependenciesMike Greiling
2017-08-04Backport to CE for:Lin Jen-Shin
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
2017-08-04Move hostname to Gitlab::EnvironmentBob Van Landuyt
2017-08-04Add a Circuitbreaker for storage pathsBob Van Landuyt
2017-08-03fix #3686 make tarball download url to end with extensionhaseeb
2017-08-03Merge branch 'master' into ideDouwe Maan
2017-08-01Inline script cleanup globals and easyTim Zallmann
2017-07-31Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-31Fix LDAP documentation and example configMichael Kozono
2017-07-31Merge branch 'inline-js-removal-projects-other' into 'master'Phil Hughes
Inline js removal projects other See merge request !13075
2017-07-28Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable
Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-28Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan
Backport some recent changes related to LDAP from EE See merge request !13119
2017-07-28Merge branch 'sh-augment-lograge-output' into 'master'Sean McGivern
Add remote IP, user ID and username to JSON lograge output See merge request !13147
2017-07-28Merge branch '35224-transform-user-profile-javascript-into-async-bundle' ↵Tim Zallmann
into 'master' Resolve "Transform user profile javascript into async bundle" Closes #35224 See merge request !12929
2017-07-28Merge branch 'master' into 'sh-augment-lograge-output'Sean McGivern
# Conflicts: # config/initializers/lograge.rb