summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '36061-mr-ref' into 'master'Sean McGivern2017-08-281-0/+3
|\ | | | | | | | | Instrument MergeRequest#ensure_ref_fetched See merge request !13876
| * Instrument MergeRequest#ensure_ref_fetched36061-mr-refJarka Kadlecova2017-08-281-0/+3
| |
* | Merge commit '2be34630623711fc20ef8c101b5cef688f207cc1' into ↵backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backstage/gb/rename-ci-cd-processing-sidekiq-queues * commit '2be34630623711fc20ef8c101b5cef688f207cc1': Common Docker Documentation Location in `gitlab-ce` fix deprecation warning present during webpack compiles Enable 5 lines of Sidekiq backtrace lines to aid in debugging Add support for copying permalink to notes via more actions dropdown Handle creating a nested group on MySQL correctly Decrease statuses batch size even more in a migration Fix repo editor scrollbar Replace 'source/search_code.feature' spinach test with an rspec analog Authorizations regarding OAuth - style confirmation Update README.md Refactor complicated API group finding rules into GroupsFinder Fix group and project search for anonymous users Document version Group Milestones API introduced Allow v4 API GET requests for groups to be unauthenticated Adjust a range and a size in stages statuses migration Update README.md Point to /developers on docs/administration/authentiq.md Indexes GFM markdown guide use inline links instead of referenced Add index on ci_runners.contacted_at
| * \ Merge branch 'fix-deprecation-warning' into 'master'Clement Ho2017-08-251-1/+1
| |\ \ | | |/ | |/| | | | | | | Fix deprecation warning when running webpack See merge request !13656
| | * fix deprecation warning present during webpack compilesMike Greiling2017-08-251-1/+1
| | |
* | | Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'Kamil Trzciński2017-08-253-9/+2
|\ \ \ | |/ / | | | | | | # Conflicts: # db/schema.rb
| * | Define ldap methods at runtimeBob Van Landuyt2017-08-241-6/+0
| | | | | | | | | | | | | | | This avoids loading the `OmniAuthCallbacksController` at boot time so it doesn't mess up the `before_action`-chain
| * | Merge branch 'disable-webpack-optimization' into 'master'Tim Zallmann2017-08-231-0/+1
| |\ \ | | | | | | | | | | | | | | | | Disable webpack.optimize because it's breaking karma in EE See merge request !13720
| | * | disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimizationMike Greiling2017-08-211-0/+1
| | | |
| * | | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-221-3/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update form to properly set the path Closes #36519 See merge request !13722
| | * | | Update form to properly set the pathZeger-Jan van de Weg2017-08-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also includes a change in allowing uploaded files, as there was a mismatch in object_id between classes, disallowing params[:file], which is a UploadedFile, newly loaded. The params checked against the older version. Fixes gitlab-org/gitlab-ce#36519
* | | | | Merge branch 'master' into backstage/gb/rename-ci-cd-processing-sidekiq-queuesGrzegorz Bizon2017-08-221-4/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (115 commits) Use event-based waiting in Gitlab::JobWaiter Make sure repository's removal work for legacy and hashed storages Use `@hashed` prefix for hashed paths on disk, to avoid collision with existing ones Refactor project and storage types Prevent using gitlab import task when hashed storage is enabled Some codestyle changes and fixes for GitLab pages Removed some useless code, codestyle changes and removed an index Fix repository reloading in some specs Changelog Moving away from the "extend" based factory to a more traditional one. Enable automatic hashed storage for new projects by application settings New storage is now "Hashed" instead of "UUID" Add UUID Storage to Project Move create_repository back to project model as we can use disk_path and share it Codestyle: move hooks to the same place and move dependent methods to private Use non-i18n values for setting new group-level issue/MR button text indexes external issue tracker copyedit indexes user/search/ from /user/index Correctly encode string params for Gitaly's TreeEntries RPC ...
| * | | | Merge branch 'zj-remove-ci-api-v1' into 'master'Kamil Trzciński2017-08-211-4/+0
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Remove CI API v1 See merge request !13652
| | * | | Remove CI API v1Zeger-Jan van de Weg2017-08-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This API was mainly for internal usage, and has been moved to the general API: APIv4. The endpoints have been deprecated since 9.0, and won't see 10.0. :)
* | | | | Adjust sidekiq queues weights in queues config fileGrzegorz Bizon2017-08-211-3/+3
| | | | |
* | | | | Assign some CI/CD workers to pipeline default queueGrzegorz Bizon2017-08-211-1/+1
| | | | |
* | | | | Assign all pipeline workers to specific queuesGrzegorz Bizon2017-08-211-0/+3
| | | | |
* | | | | Simplify pipeline sidekiq queues naming schemeGrzegorz Bizon2017-08-211-1/+1
| | | | |
* | | | | Make it possible to check if worker uses a known queueGrzegorz Bizon2017-08-211-0/+1
|/ / / /
* | | | Merge branch 'fix-broken-yarn-deps' into 'master'Tim Zallmann2017-08-211-7/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Yarn dependencies Closes #33886 and #34944 See merge request !13614
| * | | | remove zopfli compression temporarily until a better solution is foundMike Greiling2017-08-181-7/+2
| |/ / /
* | | | 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
| | | | |