summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* remove superfluous users bundleremove-user-bundleMike Greiling2017-08-181-1/+0
|
* Setup repositories settings properlymk-setup-settings-properlyMichael Kozono2017-08-171-1/+5
|
* Setup LDAP settings properlyMichael Kozono2017-08-171-0/+4
|
* Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-161-0/+20
|\ | | | | | | | | Only create commit GPG signature when necessary See merge request !13561
| * Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-161-0/+20
| |
* | Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable2017-08-162-2/+5
|\ \ | | | | | | | | | | | | | | | | | | Circuitbreaker settings to avoid spec-failures Closes #36324 See merge request !13519
| * | Use better higher threshold settings for storage access in testsBob Van Landuyt2017-08-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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
| * | Allow a `failure_wait_time` of 0 for storage accessBob Van Landuyt2017-08-161-2/+2
| | | | | | | | | | | | | | | This allows testing every storage attempt after a failure. Which could be useful for tests
* | | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-161-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Whitelist or fix additional `Gitlab/PublicSend` cop violations See merge request !13467
| * | | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | An upcoming update to rubocop-gitlab-security added additional violations.
* | | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-164-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offenses See merge request !13573
| * | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-154-8/+8
| | | | |
* | | | | Merge branch '36405-fix-mysql-timestamp-columns' into 'master'Stan Hu2017-08-151-0/+30
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Make sure MySQL would not use CURRENT_TIMESTAMP as the default for timestamp columns Closes #36405 See merge request !13560
| * | | | Make sure MySQL would not use CURRENT_TIMESTAMP36405-fix-mysql-timestamp-columnsLin Jen-Shin2017-08-151-0/+30
| | |_|/ | |/| | | | | | | | | | | | | | | | | | for timestamp columns magically. See: https://gitlab.com/gitlab-org/gitlab-ce/issues/36405
* | | | Merge branch '36152-enable-scope-hoisting-with-webpack' into 'master'Jacob Schatz2017-08-151-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Enable scope hoisting with webpack" Closes #36152 See merge request !13374
| * | | enable webpack scope hoistingMike Greiling2017-08-151-0/+3
| | |/ | |/|
* | | Improve Prometheus docs, include nginx ingressJoshua Lambert2017-08-141-4/+34
| |/ |/|
* | Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-111-2/+2
|/
* alternative route for download archivehaseeb2017-08-101-0/+3
|
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-091-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-082-3/+3
|
* Merge branch 'master' into ideMike Greiling2017-08-077-7/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+4
| |\ | | | | | | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-0/+4
| | |
| * | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-071-0/+2
| |\ \ | | | | | | | | | | | | | | | | Issuables: Move some code from create services to Sidekiq workers See merge request !13326
| | * | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-071-0/+2
| | | |
| * | | Merge branch '33902-upgrade-to-webpack-v3' into 'master'Jacob Schatz2017-08-072-7/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to webpack v3.4.0 Closes #33902 See merge request !12298
| | * | | add thunky to approved licenses (MIT)Mike Greiling2017-08-071-0/+6
| | | | |
| | * | | add disableHostCheck to devServer config since webpack dev server is proxiedMike Greiling2017-08-071-0/+1
| | | | |
| | * | | replace stats-webpack-plugin with webpack-stats-pluginMike Greiling2017-08-071-7/+13
| | | | |
| * | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| | * \ \ \ Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0718-40/+178
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-071-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support group milestone references Closes #34778 See merge request !13289
| | * | | | | Support references to group milestonesSean McGivern2017-08-071-0/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Group milestones can only be referred to by name, not IID. They also do not support cross-project references.
| * | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-0/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into ideMike Greiling2017-08-077-5/+46
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-072-3/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | # Conflicts: # app/models/repository.rb # spec/models/repository_spec.rb
| | * | | Fix issues with pdf-js dependenciesMike Greiling2017-08-071-1/+4
| | | | |
| | * | | Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-041-2/+2
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
| * | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-041-1/+0
| | | | |
| * | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-044-1/+40
| |/ / /
| * | | fix #3686 make tarball download url to end with extensionhaseeb2017-08-031-1/+1
| | | |
* | | | Merge branch 'master' into ideDouwe Maan2017-08-032-1/+6
|\ \ \ \ | |/ / /
| * | | Inline script cleanup globals and easyTim Zallmann2017-08-011-0/+5
| | | |
| * | | Fix LDAP documentation and example configmk-fix-ldap-ca-file-docsMichael Kozono2017-07-311-1/+1
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-312-2/+5
|\ \ \ | |/ /
| * | Merge branch 'inline-js-removal-projects-other' into 'master'Phil Hughes2017-07-311-1/+4
| |\ \ | | | | | | | | | | | | | | | | Inline js removal projects other See merge request !13075
| | * | Converted Pipelines ChartsTim Zallmann2017-07-271-0/+1
| | | |
| | * | Moved Inline JS for Pipelines Charts + new Pipeline to dispatcherTim Zallmann2017-07-271-1/+2
| | | |
| | * | Project New moved to external FileTim Zallmann2017-07-271-0/+1
| | | |
View Lorry Controller Status