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-27Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan
Fix race conditions for AuthorizedProjectsWorker Closes #26194 and #26310 See merge request !8701
2017-01-22Merge 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-20Merge branch 'brakeman-upgrade' into 'master' Robert Speicher
Upgrade Brakeman to 3.4.1 Closes #26820 See merge request !8629
2017-01-19Merge branch 'rs-revert-sassc' into 'master' Robert Speicher
Revert "Merge branch 'switch-to-sassc' into 'master'" Closes #26762 See merge request !8642
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-13Update gitlab-markup back to 1.5.1 in GemfileRé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-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
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-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
2016-11-18Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan
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
2016-11-17Remove unused nested_form gemRobert Speicher
2016-11-17Remove activerecord-session_store gemRobert Speicher
We use the Redis-backed session store from `redis-store` so this is unnecessary.
2016-11-17add parsing support for incoming html emailhttp://jneen.net/
2016-11-10Allow certain Sidekiq jobs to be throttledPatricio Cano
2016-11-08Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2Stan Hu
Closes gitlab-com/support-forum#1270