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
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-21Merge branch 'zj-kamil-slack-slash-commands' into 'master'Grzegorz Bizon
Slack slash commands Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements. We want to expose Slack Slash Commands as a first-class service. Supersedes !8007 Closes #22182 See merge request !8126
2016-12-16Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre
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
2016-11-04Upgrade redis-rails from 4.0.0 to 5.0.1.Connor Shea
This update adds support for Rails 5. Also update redis-rails dependencies.
2016-11-04Merge branch 'update-task-list' into 'master' Rémy Coutable
Updates deckar01-task_list gem to its latest version See merge request !7185
2016-11-03Update rdoc to `~> 4.2`Robert Speicher
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
2016-11-03Remove unused `gitlab:generate_docs` Rake taskRobert Speicher
This was the only thing using the `sdoc` gem, which was blocking another gem from updating.
2016-11-02Merge branch 'update-diffy' into 'master' Rémy Coutable
Update diffy gem to 3.1.0 See merge request !7184
2016-11-02Merge branch 'update-rack-attack' into 'master' Rémy Coutable
Updates rack-attack gem to 4.4.1 See merge request !7186
2016-11-01Update diffy gem to 3.1.0Manuel Rüger
ChangeLog: https://github.com/samg/diffy/blob/master/CHANGELOG
2016-11-01Update deckar01-task_list gem to 1.0.6Manuel Rüger
ChangeLog: https://github.com/deckar01/task_list/compare/1.0.5...1.0.6
2016-11-01Update rack-attack gem to 4.4.1Manuel Rüger
See: https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md
2016-10-28Fix lightweight tags not processed correctly by GitTagPushServiceAlejandro Rodríguez
When we updated gitlab_git to 10.4.1, `tag.target` changed from pointing to the sha of the tag to the sha of the commit the tag points to. The problem is that only annotated tags have `object_sha`s, lightweight tags don't (it's nil), so (only) in their case we still need to use `tag.target`.
2016-10-28Merge branch 'issue_1008_1' into 'master' Sean McGivern
Jira refactoring to jira gem part of gitlab-org/gitlab-ee#1008 Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2572/commits See merge request !6598
2016-10-27Upgrade jira-ruby gem versionFelipe Artur
2016-10-26Finish updates to use JIRA gemFelipe Artur
Code improvements, bug fixes, finish documentation and specs
2016-10-26Refactor JIRA service to use gemDrew Blessing
2016-10-26Updated mail_room and added sentinel support to Reply by EmailGabriel Mazetto
2016-10-19Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support ↵Patricio Cano
for IdP auto-configuration.
2016-10-17Enable activerecord_sane_schema_dumper for testKamil Trzcinski
2016-10-13Merge branch 'rs-loosen-request_store' into 'master' Dmitriy Zaporozhets
Loosen requirement on request_store version This gem follows semantic versioning and will not introduce breaking changes in a minor version. See https://github.com/steveklabnik/request_store#semantic-versioning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868 See merge request !6853
2016-10-13Loosen requirement on request_store versionRobert Speicher
This gem follows semantic versioning and will not introduce breaking changes in a minor version. See https://github.com/steveklabnik/request_store#semantic-versioning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
2016-10-13Updated gitlab-markup forked gem to download from rubygemsGabriel Mazetto
2016-10-13Use forked github-markup gem to enable python3 support with omnibusGabriel Mazetto
2016-10-12Merge branch 'dz-improve-mr-compar' into 'master' Douwe Maan
Improve merge request versions compare logic ## What does this MR do? Changes the way how we compare between for merge request versions ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So when I squash+rebase my commit I can get more accurate diff on what changed between versions ## Screenshots (if relevant) in discussion (below) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22368, https://gitlab.com/gitlab-org/gitlab-ce/issues/22721 See merge request !6589
2016-10-12Update health_check gem to `~> 2.2.0`Robert Speicher
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22278