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
AgeCommit message (Collapse)Author
2017-01-31Update and pin the `jwt` gem to ~> 1.5.6Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-27Add the rspec_profiling gem and documentation to the GitLab development ↵Nick Thomas
environment
2017-01-25Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan
Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
2017-01-25Fix race conditions for AuthorizedProjectsWorkerYorick Peterse
There were two cases that could be problematic: 1. Because sometimes AuthorizedProjectsWorker would be scheduled in a transaction it was possible for a job to run/complete before a COMMIT; resulting in it either producing an error, or producing no new data. 2. When scheduling jobs the code would not wait until completion. This could lead to a user creating a project and then immediately trying to push to it. Usually this will work fine, but given enough load it might take a few seconds before a user has access. The first one is problematic, the second one is mostly just annoying (but annoying enough to warrant a solution). This commit changes two things to deal with this: 1. Sidekiq scheduling now takes places after a COMMIT, this is ensured by scheduling using Rails' after_commit hook instead of doing so in an arbitrary method. 2. When scheduling jobs the calling thread now waits for all jobs to complete. Solution 2 requires tracking of job completions. Sidekiq provides a way to find a job by its ID, but this involves scanning over the entire queue; something that is very in-efficient for large queues. As such a more efficient solution is necessary. There are two main Gems that can do this in a more efficient manner: * sidekiq-status * sidekiq_status No, this is not a joke. Both Gems do a similar thing (but slightly different), and the only difference in their name is a dash vs an underscore. Both Gems however provide far more than just checking if a job has been completed, and both have their problems. sidekiq-status does not appear to be actively maintained, with the last release being in 2015. It also has some issues during testing as API calls are not stubbed in any way. sidekiq_status on the other hand does not appear to be very popular, and introduces a similar amount of code. Because of this I opted to write a simple home grown solution. After all, all we need is storing a job ID somewhere so we can efficiently look it up; we don't need extra web UIs (as provided by sidekiq-status) or complex APIs to update progress, etc. This is where Gitlab::SidekiqStatus comes in handy. This namespace contains some code used for tracking, removing, and looking up job IDs; all without having to scan over an entire queue. Data is removed explicitly, but also expires automatically just in case. Using this API we can now schedule jobs in a fork-join like manner: we schedule the jobs in Sidekiq, process them in parallel, then wait for completion. By using Sidekiq we can leverage all the benefits such as being able to scale across multiple cores and hosts, retrying failed jobs, etc. The one downside is that we need to make sure we can deal with unexpected increases in job processing timings. To deal with this the class Gitlab::JobWaiter (used for waiting for jobs to complete) will only wait a number of seconds (30 by default). Once this timeout is reached it will simply return. For GitLab.com almost all AuthorizedProjectWorker jobs complete in seconds, only very rarely do we spike to job timings of around a minute. These in turn seem to be the result of external factors (e.g. deploys), in which case a user is most likely not able to use the system anyway. In short, this new solution should ensure that jobs are processed properly and that in almost all cases a user has access to their resources whenever they need to have access.
2017-01-23Merge branch 'upgrade-omniauth' into 'security' Robert Speicher
Upgrade OmniAuth Ruby gem to 1.3.2 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26813 See merge request !2056
2017-01-19Merge branch 'brakeman-upgrade' into 'master' Robert Speicher
Upgrade Brakeman to 3.4.1 Closes #26820 See merge request !8629
2017-01-19Revert "Merge branch 'switch-to-sassc' into 'master' "Robert Speicher
This reverts commit e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1, reversing changes made to 78d710388fbabe27481c77cc353610904465c4df. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26762
2017-01-18Upgrade Brakeman to 3.4.1Brian Neel
2017-01-17Merge branch 'switch-to-sassc' into 'master' Robert Speicher
Switch to sassc-rails Closes #18432 See merge request !8556
2017-01-17Switch to sassc-railsRichard Macklin
Closes #18432 This uses sassc to compile the application's SASS so it compiles faster. Without attempting to be very scientific here are some numbers I got: Using sassc-rails: ``` [1] pry(main)> Benchmark.bm { |bm| bm.report { Rails.application.assets["application.css"] } } user system total real 1.430000 0.380000 1.810000 ( 1.830753) ``` Using sass-rails: ``` [1] pry(main)> Benchmark.bm { |bm| bm.report { Rails.application.assets["application.css"] } } user system total real 12.320000 0.530000 12.850000 ( 12.909684) ``` The result is faster page loads when changing CSS in development and faster precompilation.
2017-01-17Merge branch '19633-remove-rerun' into 'master' Robert Speicher
Remove rerun since it's not used anymore Closes #19633 See merge request !8598
2017-01-16Remove rerun since it's not used anymoreRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-16Update ffaker to ~>2.4 to avoid generating names with suffixesRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-12Add support for PlantUML diagrams in Asciidoc.Horacio Sanson
This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603
2017-01-11Merge branch 'patch-turbolinks' into 'security'Robert Speicher
Updated Turbolinks to patched version of turbolinks-classic See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
2017-01-10Update Gemfile.lock to reflect Rubocop gem versionGrzegorz Bizon
2017-01-10Merge branch 'update-rubocop' into 'master' Sean McGivern
Update rubocop and rubocop-rspec to fix build errors See merge request !8466
2017-01-09Update the gitlab-markup gem to the version `1.5.1`Douglas Barbosa Alexandre
2017-01-06Update rubocop and rubocop-rspec to fix build errorsBrian Neel
2017-01-06Re-add Google Cloud Storage as a backup strategyRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-05Absorb gitlab_gitRobert Speicher
2017-01-03Fix Gemfile.lock for the octokit updateYorick Peterse
MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8158 updated the octokit Gem but did not include all the changes for Gemfile.lock.
2016-12-30Update octokit to 4.6.2Manuel Rüger
ChangeLog: https://github.com/octokit/octokit.rb/releases
2016-12-28Merge branch 'mrchrisw-update-vmstat' into 'master' Stan Hu
Update vmstat to version 2.3.0 Closes #26114 See merge request !8318
2016-12-27Update vmstat to version 2.3.0Chris Wilson
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/26114 vmstat 2.3.0 fixes an issue with reporting the incorrect # of CPUs. This is used in the GitLab Admin Dashboard.
2016-12-21switch to email_reply_trimmer from discoursehttp://jneen.net/
2016-12-21Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable
Added support for Authentiq OAuth provider See merge request !8038
2016-12-21Added support for Authentiq oauth providerAlex
2016-12-20Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon
Slack slash commands ## What does this MR do? Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements. ## Why was this MR needed? We want to expose Slack Slash Commands as a first-class service. ## What are the relevant issue numbers? Supersedes !8007 Closes #22182 See merge request !8126
2016-12-16Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre
2016-12-16Create Slack Slash command serviceZ.J. van de Weg
2016-12-16Merge branch 'gem-update-grape' into 'master' Rémy Coutable
Update grape to 0.18.0 ## What does this MR do? Update grape to 0.18.0. Required for the settings API. ## What are the relevant issue numbers? #22928 See merge request !8057
2016-12-15Introduce deployment services, starting with a KubernetesServiceNick Thomas
2016-12-14Update grape to 0.18.0Robert Schilling
2016-12-14Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov
2016-12-12Update Sidekiq from 4.2.1 to 4.2.7.Connor Shea
Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md
2016-12-08Update factory_girl_rails to 4.7.0Robert Speicher
2016-12-05Merge branch 'pry-byebug' into 'master' Rémy Coutable
Use pry-byebug instead byebug See merge request !7925
2016-12-05Use pry-byebug instead byebugSemyon Pupkov
https://github.com/deivid-rodriguez/pry-byebug
2016-12-05Update paranoia from 2.1.4 to 2.2.0.Connor Shea
Includes support for Rails 5. Changelog: https://github.com/rubysherpas/paranoia/blob/879fd18caa46af70fceca2e8f46886b3eff072ec/CHANGELOG.md#220-2016-10-21
2016-11-30Revert bump in rufus-schedulerStan Hu
Somehow `bundle install` with an update to Sidekiq-cron caused rufus-scheduler to be bumped, when it doesn't appear absolutely necessary. Closes #25160
2016-11-30Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov
2016-11-30Merge branch 'add-stackprof' into 'master' Robert Speicher
Add StackProf to the Gemfile, along with a utility to get a profile for a spec The test suite needs speeding up significantly. This is one tool for investigating it. Related to #23034 See merge request !7784
2016-11-29Add StackProf to the Gemfile, along with a utility to get a profile for a specNick Thomas
2016-11-29Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1Stan Hu
The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface. Closes #24376
2016-11-25Merge branch 'zj-upgrade-grape' into 'master' Robert Speicher
Update grape-entity to 0.6.0 See merge request !7491
2016-11-24Stop supporting Google and Azure as backup strategiesRémy Coutable
The amount of gems required is quite high compared to the usefulness of the features. Related to !4928, !6713 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-23Upgrade grape-entity to 0.6.0Z.J. van de Weg
2016-11-22Remove omniauth-bitbucket gemDouglas Barbosa Alexandre
2016-11-21Upgrade grape-entityZ.J. van de Weg
Fixes gitlab-org/gitlab-ce#14329