summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Initial work on GitLab Pages updateKamil Trzcinski2017-01-311-0/+3
|
* Update and pin the `jwt` gem to ~> 1.5.627488-fix-jwt-versionRémy Coutable2017-01-311-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add the rspec_profiling gem and documentation to the GitLab development ↵23034-enable-rspec-profilingNick Thomas2017-01-271-0/+1
| | | | environment
* Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-251-1/+1
|\ | | | | | | | | | | | | Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
| * Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'upgrade-omniauth' into 'security' Robert Speicher2017-01-231-1/+1
|/ | | | | | | Upgrade OmniAuth Ruby gem to 1.3.2 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26813 See merge request !2056
* Merge branch 'brakeman-upgrade' into 'master' Robert Speicher2017-01-191-1/+1
|\ | | | | | | | | | | | | Upgrade Brakeman to 3.4.1 Closes #26820 See merge request !8629
| * Upgrade Brakeman to 3.4.1brakeman-upgradeBrian Neel2017-01-181-1/+1
| |
* | Revert "Merge branch 'switch-to-sassc' into 'master' "Robert Speicher2017-01-191-1/+1
|/ | | | | | | This reverts commit e7fdb1aae5a61b30f66ea3489d4e0759ed8ea3a1, reversing changes made to 78d710388fbabe27481c77cc353610904465c4df. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/26762
* Merge branch 'switch-to-sassc' into 'master' Robert Speicher2017-01-171-1/+1
|\ | | | | | | | | | | | | Switch to sassc-rails Closes #18432 See merge request !8556
| * Switch to sassc-railsRichard Macklin2017-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch '19633-remove-rerun' into 'master' Robert Speicher2017-01-171-1/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove rerun since it's not used anymore Closes #19633 See merge request !8598
| * | Remove rerun since it's not used anymore19633-remove-rerunRémy Coutable2017-01-161-1/+0
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Update ffaker to ~>2.4 to avoid generating names with suffixes26492-fix-transient-failure-in-commits_specRémy Coutable2017-01-161-1/+1
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update gitlab-markup back to 1.5.1 in Gemfile26627-update-gitlab-markup-to-1-5-1-againRémy Coutable2017-01-121-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-12/+13
| | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'patch-turbolinks' into 'security'Robert Speicher2017-01-101-2/+1
| | | | | | Updated Turbolinks to patched version of turbolinks-classic See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
* Merge branch 'update-rubocop' into 'master' Sean McGivern2017-01-101-2/+2
|\ | | | | | | | | Update rubocop and rubocop-rspec to fix build errors See merge request !8466
| * Update rubocop and rubocop-rspec to fix build errorsupdate-rubocopBrian Neel2017-01-061-2/+2
| |
* | Update the gitlab-markup gem to the version `1.5.1`Douglas Barbosa Alexandre2017-01-091-1/+1
| |
* | Re-add Google Cloud Storage as a backup strategysupport-google-cloud-storage-backupsRémy Coutable2017-01-061-0/+4
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Absorb gitlab_gitRobert Speicher2017-01-041-4/+2
|
* Update octokit to 4.6.2Manuel Rüger2016-12-301-1/+1
| | | | ChangeLog: https://github.com/octokit/octokit.rb/releases
* Merge branch 'mrchrisw-update-vmstat' into 'master' Stan Hu2016-12-281-1/+1
|\ | | | | | | | | | | | | Update vmstat to version 2.3.0 Closes #26114 See merge request !8318
| * Update vmstat to version 2.3.0mrchrisw-update-vmstatChris Wilson2016-12-271-1/+1
| | | | | | | | | | | | 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.
* | switch to email_reply_trimmer from discoursehttp://jneen.net/2016-12-211-1/+1
|/
* Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-211-0/+1
|\ | | | | | | | | Added support for Authentiq OAuth provider See merge request !8038
| * Added support for Authentiq oauth providerAlex2016-12-211-0/+1
| |
* | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-201-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Create Slack Slash command serviceZ.J. van de Weg2016-12-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-161-1/+4
|\ \ | |/
| * Merge branch 'gem-update-grape' into 'master' Rémy Coutable2016-12-161-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Update grape to 0.18.0gem-update-grapeRobert Schilling2016-12-141-1/+1
| | |
| * | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-141-0/+3
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-141-4/+4
|\ \ | |/
| * Update Sidekiq from 4.2.1 to 4.2.7.cs-update-sidekiq-427Connor Shea2016-12-111-1/+1
| | | | | | | | | | | | Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md
| * Update factory_girl_rails to 4.7.0rs-update-factory_girl_railsRobert Speicher2016-12-081-1/+1
| |
| * Merge branch 'pry-byebug' into 'master' Rémy Coutable2016-12-051-1/+1
| |\ | | | | | | | | | | | | Use pry-byebug instead byebug See merge request !7925
| | * Use pry-byebug instead byebugSemyon Pupkov2016-12-051-1/+1
| | | | | | | | | | | | https://github.com/deivid-rodriguez/pry-byebug
| * | Update paranoia from 2.1.4 to 2.2.0.cs-upgrade-paranoiaConnor Shea2016-12-041-1/+1
| |/ | | | | | | | | | | Includes support for Rails 5. Changelog: https://github.com/rubysherpas/paranoia/blob/879fd18caa46af70fceca2e8f46886b3eff072ec/CHANGELOG.md#220-2016-10-21
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-301-4/+4
|\ \ | |/
| * Merge branch 'add-stackprof' into 'master' Robert Speicher2016-11-301-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add StackProf to the Gemfile, along with a utility to get a profile for a specNick Thomas2016-11-291-0/+2
| | |
| * | Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1sh-update-sidekiq-cronStan Hu2016-11-291-1/+1
| |/ | | | | | | | | | | | | The "Enqueue Now" button would not work in the admin panel due to changes in the Web extension interface. Closes #24376
| * Merge branch 'zj-upgrade-grape' into 'master' Robert Speicher2016-11-251-1/+1
| |\ | | | | | | | | | | | | Update grape-entity to 0.6.0 See merge request !7491
| | * Upgrade grape-entity to 0.6.0Z.J. van de Weg2016-11-231-1/+1
| | |
| | * Upgrade grape-entityZ.J. van de Weg2016-11-211-1/+1
| | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#14329
| * | Stop supporting Google and Azure as backup strategiesremove-backup-strategiesRémy Coutable2016-11-241-2/+0
| |/ | | | | | | | | | | | | | | | | 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>
* | Remove omniauth-bitbucket gemDouglas Barbosa Alexandre2016-11-211-1/+0
|/
* Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan2016-11-181-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | add parsing support for incoming html email ## What does this MR do? Fixes #18388 by adding support for parsing HTML email ## Are there points in the code the reviewer needs to double check? The new class, Gitlab::Email::HTMLParser, which needs to translate the HTML content to text and also delete replies, as they are not necessarily in the correct format to be caught by EmailReplyParser. The solution I found that should work for any HTML-formatted email is to remove all `<table>` and `<blockquote>` tags. Actual `<table>` elements (to be interpreted by markdown) should already be encoded with e.g. `&lt;table&gt;` - the only failure mode is if there is an *actual* HTML table in the content itself, which we wouldn't be able to support easily anyways. The gem `html2text` traverses the HTML tree and outputs text - and markdown in the case of HTML links or images. See merge request !7397