Commit Graph
783 Commits
Author SHA1 Message Date
Robert Speicher 42a391f744 Update spring and spring-commands-spinach
Spring changelog: https://git.io/vVAUY
2016-04-12 14:28:07 -04:00
connorshea a7e1638b43 Upgrade annotate from 2.6.10 to 2.7.0
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-10 15:14:57 -06:00
connorshea 1647e3e884 Upgrade Sprockets from 3.3.5 to 3.6.0.
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-09 08:29:57 -06:00
Robert Speicher 955d027d17 Merge branch 'rs-update-rails' into 'master'
Bump rails to 4.2.6

See merge request !3424
2016-04-09 04:07:48 +00:00
Robert Speicher 93571c4335 Merge branch 'redis-connection-pool' into 'master'
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-08 22:26:53 +00:00
connorshea 50ef9fcafb Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2
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-06 23:54:28 -06:00
Jacob Vosmaer 3137f61a55 Make redis an explicit Gemfile dependency 2016-04-06 10:49:57 +02:00
Robert Speicher 5ff9d2a182 Bump rails to 4.2.6 2016-04-05 13:07:53 -04:00
Yorick Peterse 57bde0ce65 Cache Banzai projects/objects using RequestStore
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-04-04 10:44:35 +02:00
Robert Speicher db0da43a46 Merge branch 'upgrade-brakeman' into 'master'
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-27 20:39:59 +00:00
connorshea e664d95437 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).
2016-03-25 15:48:13 -06:00
connorshea f967d5cf3d 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)
2016-03-24 21:48:06 -06:00
Rémy Coutable 17de30f412 Merge branch 'backport-ee-premailer' into 'master'
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-21 10:46:37 +00:00
connorshea 6274136c9a Update Rubocop from 0.35.1 to 0.38.0.
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-20 20:49:12 -06:00
Douwe Maan a8aa59e96e Inline mailer CSS using premailer.
# Conflicts:
#	Gemfile.lock
2016-03-19 20:04:10 +01:00
Yorick Peterse 3f0d780c19 Show a notice for diffs that are too large
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-18 12:30:46 +01:00
Daniel CarraroandRémy Coutable d6caadd1d5 Added omniauth-auth0 Gem + Applicable Documentation. 2016-03-16 13:12:20 +01:00
Hiroyuki Sato 8acad49fe0 Support Wiki with UTF-8 page name 2016-03-16 02:17:07 +09:00
Jacob Schatz 37707ac59e Merge branch 'css-style-guide' into 'master'
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-15 16:52:53 +00:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' "
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
2016-03-15 14:55:40 +01:00
connorshea 8d8b457ceb Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add documentation for SCSS Style Guide.
See !3069 for more information.
2016-03-14 20:33:54 -06:00
Stan Hu 3cc040e110 Bump Capybara gem to 2.6.2 2016-03-14 09:10:36 -07:00
Patricio Cano 32ddf092f3 Upgrade omniauth-saml to 1.5.0 and document it's new capabilities. 2016-03-10 16:07:10 -05:00
Dmitriy Zaporozhets e72ae40c95 Merge branch 'rs-bump-poltergeist' into 'master'
Bump poltergeist to `~> 1.9.0`



See merge request !3116
2016-03-09 16:15:34 +00:00
Kamil Trzcinski af43401602 Retry spinach tests 2016-03-09 14:22:32 +01:00
Kamil Trzcinski 640bf8ab72 Retry failed tests 2016-03-09 14:21:19 +01:00
Robert Speicher f05c22295d Bump poltergeist to ~> 1.9.0 2016-03-07 15:03:55 -05:00
Douwe Maan 28bee175db Merge branch 'issue_2805' into 'master'
Upgrade carrierwave to 0.10.0.

Closes #2805 

See merge request !3084
2016-03-05 14:48:36 +00:00
Robert Speicher 5de46014d7 Bump factory_girl_rails to ~> 4.6.0 2016-03-04 15:26:41 -05:00
Rubén Dávila 71a2303567 Upgrade carrierwave to 0.10.0. 2016-03-03 20:32:18 -05:00
Gabriel Mazetto 1ecefd3718 Update spring to 1.6.4 to fix support for Bundler 1.11 2016-03-03 17:08:16 -03:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Robert Speicher 940d689d18 Bump sprockets to ~> 3.3.5
Closes #6069
2016-03-01 18:25:10 -05:00
Robert Speicher dc1c4e0712 Update Rails to 4.2.5.2
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
2016-02-29 17:45:56 -05:00
Phil Hughes cb0e26d1f7 Removed NGProgress
In an effort to get the JS file size down, i've removed NGProgress and replaced with TurboLinks own loading indicator

Ref #13820
2016-02-29 09:47:22 +00:00
Alfredo Sumaran 0104ab79b3 Merge branch 'master' into avatar-cropping 2016-02-24 10:42:51 -05:00
Rémy Coutable bd71438d6a Merge branch 'bring-back-newrelic-gem' into 'master'
Revert "Remove newrelic gem. Closes #12860"

This reverts commit 531767175f.

Conflicts:
	Gemfile.lock

See merge request !2943
2016-02-24 07:25:36 +00:00
Alfredo Sumaran af978cd5bc Merge branch 'master' into avatar-cropping 2016-02-23 16:52:43 -05:00
Robert Speicher 8a6bd6d2b4 Update sentry-raven to 0.15.6 2016-02-23 15:34:16 -05:00
Stan Hu 623cd23903 Revert "Remove newrelic gem. Closes #12860"
This reverts commit 531767175f.

Conflicts:
	Gemfile.lock
2016-02-23 07:25:37 -08:00
Rubén DávilaandRobert Speicher 112b1add4c Upgrade gitlab_git to 8.2.0 2016-02-19 13:15:39 -05:00
Douwe Maan ad12f11f3e Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness 

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
2016-02-19 08:11:02 +00:00
Robert Speicher 594d21cdca Bump unicorn to ~> 4.9.0 2016-02-16 18:15:06 -05:00
Johann Pardanaud fb6d7df347 Merge branch 'master' into avatar-cropping
Conflicts:
	app/models/user.rb
2016-02-16 19:53:51 +01:00
Takuya Noguchi 4646cbc4c6 Update omniauth to 1.3.1 for memory performance 2016-02-13 12:59:55 +09:00
Robert Speicher f9bf87bbe8 Update gitlab_emoji to ~> 0.3.0 2016-02-12 15:34:00 -05:00
Robert Speicher c880d877b8 Loosen Nokogiri version requirement
Closes #13218
2016-02-11 14:31:31 -05:00
Johann Pardanaud 6d5808801f Fix #7959: Fix avatar stretching by providing a cropping feature 2016-02-09 22:26:50 +01:00
Robert Speicher 70b7eacfb2 Merge branch 'improve-diverging-commit-counts' into 'master'
Dedicated method for counting commits between refs

Corresponding gitlab_git merge request: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/66
Issue that lead to these changes: https://gitlab.com/gitlab-org/gitlab-ce/issues/12619

See merge request !2707
2016-02-05 21:45:48 +00:00
Yorick Peterse b263ab618c Dedicated method for counting commits between refs
gitlab_git 8.1 adds the ability to count the amount of commits between
two references without having to allocate anything but regular
Rugged::Commit objects. This in turn speeds up the process of counting
the number of commits a branch is ahead/behind by about 3.5x.
2016-02-04 19:42:40 +01:00