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-04-12Update spring and spring-commands-spinachRobert Speicher
Spring changelog: https://git.io/vVAUY
2016-04-11Merge branch 'upgrade-annotate' into 'master' Robert Speicher
Upgrade annotate from 2.6.10 to 2.7.0 We don’t have any tests for this, so no need to run them. [ci skip] Includes compatibility with Rails 5. Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286. See merge request !3645
2016-04-11Upgrade annotate from 2.6.10 to 2.7.0connorshea
Includes compatibility with Rails 5. We don’t have any tests for this, so no need to run them. [ci skip] Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286.
2016-04-10Upgrade premailer-rails from 1.9.0 to 1.9.2connorshea
Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19 2 Working towards #14286.
2016-04-09Upgrade Sprockets from 3.3.5 to 3.6.0.connorshea
Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Resolves #14344.
2016-04-09Merge branch 'rs-update-rails' into 'master' Robert Speicher
Bump rails to 4.2.6 See merge request !3424
2016-04-09Merge branch 'redis-connection-pool' into 'master' Robert Speicher
Redis connection pool Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 Having an easily accessible Redis connection pool allows us to do more cool stuff with Redis in GitLab (instead of having to go through e.g. the Rails cache). See merge request !3521
2016-04-07Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2connorshea
This removes a few dependencies! It was also rude to be using coveralls 0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also paves the way for updating mime-types to 3.0. Coveralls Changelog: https://github.com/lemurheavy/coveralls-ruby/releases Simplecov Changelog: https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md
2016-04-06Make redis an explicit Gemfile dependencyJacob Vosmaer
2016-04-05Merge branch 'upgrade-bundler-audit' into 'master' Robert Speicher
Upgrade bundler-audit from 0.4.0 to 0.5.0 Bundler Audit can now run the `check` command with an `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI ([source](https://github.com/rubysec/bundler-audit#synopsis)). See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2015-02-28 See merge request !3433
2016-04-05Bump rails to 4.2.6Robert Speicher
2016-04-04Cache Banzai projects/objects using RequestStoreYorick Peterse
This was originally suggested by @ayufan and modified to be a bit cleaner and use RequestStore instead of a regular Hash. By caching the output of the two methods involved the number of queries is reduced significantly. For example, for an issue with 200 notes (of which 100 reference a number of merge requests) this cuts down the amount of queries from around 6300 to around 3300.
2016-03-31Merge branch 'upgrade-coffee-rails' into 'master' Robert Speicher
Upgrade coffee-rails to 4.1.1 Includes Rails 5 support. [See Changelog for more info](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md#411-dece mber-18-2015). Working towards #14286. See merge request !3398
2016-03-29Upgrade bundler-audit from 0.4.0 to 0.5.0connorshea
Bundler Audit can now run check with the `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI. See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2 015-02-28
2016-03-28Merge branch 'upgrade-web-console' into 'master' Robert Speicher
Upgrade web-console to 2.3.0 Rails 5 compatibility release. [See the Changelog for more information](https://github.com/rails/web-console/releases/tag/v2.3.0). Working towards #14286. See merge request !3400
2016-03-27Merge branch 'upgrade-font-awesome' into 'master' Robert Speicher
Upgrade font-awesome-rails to 4.5.0.1 Includes Rails 5 support. [See Changelog for details](https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1). Working towards #14286. See merge request !3399
2016-03-27Merge branch 'upgrade-brakeman' into 'master' Robert Speicher
Upgrade Brakeman from 3.1.4 to 3.2.1 Includes support for Rails 5, bug fixes, and various additional vulnerability checks. [See Changelog for more information](https://github.com/presidentbeef/brakeman/blob/master/CHANGES). Working towards #14286. See merge request !3397
2016-03-27Merge branch 'upgrade-teaspoon' into 'master' Robert Speicher
Upgrade Teaspoon from 1.0.1 to 1.1.5. Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md). Working towards #14286. See merge request !3409
2016-03-26Upgrade Teaspoon from 1.0.1 to 1.1.5.connorshea
Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).
2016-03-25Upgrade coffee-rails from 4.1.0 to 4.1.1connorshea
Includes Rails 5 support. See Changelog for more info (https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md#411-dece mber-18-2015)
2016-03-25Upgrade Brakeman from 3.1.4 to 3.2.1connorshea
Includes support for Rails 5, bug fixes, and various additional vulnerability checks. See Changelog for more information (https://github.com/presidentbeef/brakeman/blob/master/CHANGES)
2016-03-25Upgrade web-console to 2.3.0connorshea
Rails 5 compatibility release. See the Changelog for more information: https://github.com/rails/web-console/releases/tag/v2.3.0
2016-03-25Upgrade font-awesome-rails to 4.5.0.1connorshea
Includes Rails 5 support. See changelog for details: https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1
2016-03-25Upgrade Bullet to 5.0.0connorshea
Includes Rails 5 support. See changelog for details (https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
2016-03-22Merge branch 'master' into issue_12658Douwe Maan
# Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
2016-03-21Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable
Backport premailer and diff changes from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !3318
2016-03-21Update Rubocop from 0.35.1 to 0.38.0.connorshea
Discussed in #14233. See [their releases](https://github.com/bbatsov/rubocop/releases) for more info. Changes: - Enable DisplayCopNames for lint output. - Default behavior for `Alias` changed, set to enforce `prefer_alias_method`. - Enabling Rails cops changed to new syntax. - Remove StyleGuides and move Descriptions to comments. - Add missing cops. - Add TODOs for cops that should be enabled in the future. - Set TargetRubyVersion to 2.1.
2016-03-20Merge branch 'master' into issue_12658Douwe Maan
2016-03-19Inline mailer CSS using premailer.Douwe Maan
# Conflicts: # Gemfile.lock
2016-03-18Show a notice for diffs that are too largeYorick Peterse
This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster.
2016-03-17Merge 4009-external-users into issue_12658Felipe Artur
2016-03-16Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro
2016-03-15Support Wiki with UTF-8 page nameHiroyuki Sato
2016-03-15Merge branch 'css-style-guide' into 'master' Jacob Schatz
CSS style guide Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI. TODO: - [x] Agree on and write SCSS Style Guide Documentation. - [x] Document the `scss-lint` config file. - [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should. - [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?). My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect. Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources. /cc @jschatz1 @rspeicher See merge request !3069
2016-03-15Revert "Merge branch 'avatar-cropping' into 'master' "Rémy Coutable
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
2016-03-15Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add ↵connorshea
documentation for SCSS Style Guide. See !3069 for more information.
2016-03-15Bump gitlab_git to 9.0.3Stan Hu
2016-03-14Bump Capybara gem to 2.6.2Stan Hu
2016-03-11Merge branch 'omniauth-saml-upgrade' into 'master' Patricio Cano
Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities. With this MR I'm upgrading `omniauth-saml` to 1.5.0 to include new and improved functionality. See https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md for more details. This MR includes new documentation, so @axil can you also take a look? /cc @DouweM See merge request !3170
2016-03-11Merge branch 'update-gitlab-git' into 'master' Douwe Maan
Updated gitlab_git to 9.0.1 This includes gitlab-org/gitlab_git!69 and will hopefully solve gitlab-org/gitlab-ce#13808. See merge request !3123
2016-03-11Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities.Patricio Cano
2016-03-09Merge branch 'rs-bump-poltergeist' into 'master' Dmitriy Zaporozhets
Bump poltergeist to `~> 1.9.0` See merge request !3116
2016-03-09Retry spinach testsKamil Trzcinski
2016-03-09Retry failed testsKamil Trzcinski
2016-03-08Updated gitlab_git to 9.0.1Yorick Peterse
This includes gitlab-org/gitlab_git!69 and will hopefully solve gitlab-org/gitlab-ce#13808.
2016-03-07Bump poltergeist to `~> 1.9.0`Robert Speicher
2016-03-05Merge branch 'issue_2805' into 'master' Douwe Maan
Upgrade carrierwave to 0.10.0. Closes #2805 See merge request !3084
2016-03-04Bump factory_girl_rails to ~> 4.6.0Robert Speicher
2016-03-04Upgrade carrierwave to 0.10.0.Rubén Dávila
2016-03-03Update spring to 1.6.4 to fix support for Bundler 1.11Gabriel Mazetto