summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Collapse)AuthorAgeFilesLines
* Cache Banzai projects/objects using RequestStoreYorick Peterse2016-04-041-2/+2
| | | | | | | | | | 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.
* Merge branch 'upgrade-coffee-rails' into 'master' Robert Speicher2016-03-311-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * Upgrade coffee-rails from 4.1.0 to 4.1.1connorshea2016-03-251-2/+2
| | | | | | | | | | | | | | | | Includes Rails 5 support. See Changelog for more info (https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md#411-dece mber-18-2015)
* | Merge branch 'upgrade-web-console' into 'master' Robert Speicher2016-03-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Upgrade web-console to 2.3.0connorshea2016-03-241-1/+4
| |/ | | | | | | | | | | | | Rails 5 compatibility release. See the Changelog for more information: https://github.com/rails/web-console/releases/tag/v2.3.0
* | Merge branch 'upgrade-font-awesome' into 'master' Robert Speicher2016-03-271-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Upgrade font-awesome-rails to 4.5.0.1connorshea2016-03-241-2/+5
| |/ | | | | | | | | | | | | Includes Rails 5 support. See changelog for details: https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1
* | Merge branch 'upgrade-brakeman' into 'master' Robert Speicher2016-03-271-11/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Upgrade Brakeman from 3.1.4 to 3.2.1connorshea2016-03-241-11/+8
| |/ | | | | | | | | | | | | | | 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)
* | Merge branch 'upgrade-teaspoon' into 'master' Robert Speicher2016-03-271-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Upgrade Teaspoon from 1.0.1 to 1.1.5.connorshea2016-03-251-3/+6
| |/ | | | | | | | | | | Includes compatibility with Rails 5. See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).
* | Upgrade Bullet to 5.0.0connorshea2016-03-241-1/+4
|/ | | | | Includes Rails 5 support. See changelog for details (https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
* Merge branch 'master' into issue_12658Douwe Maan2016-03-211-11/+19
|\ | | | | | | | | | | | | | | | | # 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
| * Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable2016-03-211-0/+10
| |\ | | | | | | | | | | | | | | | | | | Backport premailer and diff changes from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !3318
| | * Inline mailer CSS using premailer.Douwe Maan2016-03-191-0/+10
| | | | | | | | | | | | | | | # Conflicts: # Gemfile.lock
| * | Update Rubocop from 0.35.1 to 0.38.0.connorshea2016-03-201-11/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into issue_12658Douwe Maan2016-03-201-4/+11
|\ \ | |/
| * Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-3/+3
| | | | | | | | | | | | | | 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.
| * Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-161-0/+3
| |
| * Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-161-1/+5
| |
* | Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-12/+12
|\ \ | |/
| * Merge branch 'css-style-guide' into 'master' Jacob Schatz2016-03-151-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add ↵connorshea2016-03-141-0/+4
| | | | | | | | | | | | | | | | | | documentation for SCSS Style Guide. See !3069 for more information.
| * | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-151-2/+0
| | | | | | | | | | | | | | | This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
| * | Bump gitlab_git to 9.0.3Stan Hu2016-03-141-1/+1
| | |
| * | Bump Capybara gem to 2.6.2Stan Hu2016-03-141-2/+3
| |/
| * Merge branch 'omniauth-saml-upgrade' into 'master' Patricio Cano2016-03-111-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Upgrade `omniauth-saml` to 1.5.0 and document it's new capabilities.Patricio Cano2016-03-101-4/+4
| |/ |/|
| * Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-03-111-1/+1
| |\ |/ / | | | | | | | | | | | | 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
| * Updated gitlab_git to 9.0.1Yorick Peterse2016-03-081-1/+1
| | | | | | | | | | This includes gitlab-org/gitlab_git!69 and will hopefully solve gitlab-org/gitlab-ce#13808.
* | Merge branch 'rs-bump-poltergeist' into 'master' Dmitriy Zaporozhets2016-03-091-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Bump poltergeist to `~> 1.9.0` See merge request !3116
| * | Bump poltergeist to `~> 1.9.0`rs-bump-poltergeistRobert Speicher2016-03-071-2/+2
| |/
* | Retry spinach testsKamil Trzcinski2016-03-091-0/+3
| |
* | Retry failed testsKamil Trzcinski2016-03-091-0/+3
|/
* Merge branch 'issue_2805' into 'master' Douwe Maan2016-03-051-2/+3
|\ | | | | | | | | | | | | Upgrade carrierwave to 0.10.0. Closes #2805 See merge request !3084
| * Upgrade carrierwave to 0.10.0.issue_2805Rubén Dávila2016-03-031-2/+3
| |
* | Bump factory_girl_rails to ~> 4.6.0Robert Speicher2016-03-041-4/+4
| |
* | Update spring to 1.6.4 to fix support for Bundler 1.11Gabriel Mazetto2016-03-031-2/+2
| |
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-2/+2
|/
* Bump sprockets to `~> 3.3.5`rs-update-sprocketsRobert Speicher2016-03-011-8/+4
| | | | Closes #6069
* Update Rails to 4.2.5.2Robert Speicher2016-02-291-30/+30
| | | | | See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ
* Removed NGProgressremoved-ngprogressPhil Hughes2016-02-291-2/+0
| | | | | | In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator Ref #13820
* Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-261-1/+1
|\
| * Fix order in Gemfile.lockfix-gemfile-lockJacob Vosmaer2016-02-251-1/+1
| |
* | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-241-0/+2
|\ \ | |/
| * Merge branch 'bring-back-newrelic-gem' into 'master' Rémy Coutable2016-02-241-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove newrelic gem. Closes #12860" This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock See merge request !2943
| | * Revert "Remove newrelic gem. Closes #12860"Stan Hu2016-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock
* | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-231-14/+14
|\ \ \ | |/ /
| * | Update sentry-raven to 0.15.6Robert Speicher2016-02-231-2/+2
| |/
| * Upgrade gitlab_git to 8.2.0Rubén Dávila2016-02-191-5/+5
| |
View Lorry Controller Status