home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
912 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
Robert Speicher ca7fa51065 Merge branch 'upgrade-annotate' into 'master' 
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-11 03:23:03 +00: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 94b48d9557 Upgrade premailer-rails from 1.9.0 to 1.9.2 
Includes compatibility with Rails 5.

Changelog:
https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19
2

Working towards #14286.
 2016-04-10 14:36:31 -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 c61fe24529 Merge branch 'upgrade-bundler-audit' into 'master' 
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-05 17:40:52 +00: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 605eae85ba Merge branch 'upgrade-coffee-rails' into 'master' 
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-31 00:56:38 +00:00
connorshea aa97720a93 Upgrade bundler-audit from 0.4.0 to 0.5.0 
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-28 16:43:42 -06:00
Robert Speicher ccf50e81b7 Merge branch 'upgrade-web-console' into 'master' 
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-27 22:23:42 +00:00
Robert Speicher a6a7a5ddd7 Merge branch 'upgrade-font-awesome' into 'master' 
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-27 20:41:35 +00: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
Robert Speicher f7a9fc9cf8 Merge branch 'upgrade-teaspoon' into 'master' 
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-27 20:38:26 +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 f784393213 Upgrade coffee-rails from 4.1.0 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)
 2016-03-25 12:54:40 -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
connorshea 2fe8da0b50 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
 2016-03-24 21:29:12 -06:00
connorshea 057244b4c0 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
 2016-03-24 20:28:24 -06:00
connorshea 8d2ded95c8 Upgrade Bullet to 5.0.0 
Includes Rails 5 support. See changelog for details
(https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
 2016-03-24 20:21:32 -06:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# 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-21 23:22:21 +01: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 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01: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
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03: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 d0d7dfb2f5 Bump gitlab_git to 9.0.3 2016-03-14 15:41:36 -07:00
Stan Hu 3cc040e110 Bump Capybara gem to 2.6.2 2016-03-14 09:10:36 -07:00
Patricio Cano 6bc7fad8ea Merge branch 'omniauth-saml-upgrade' into 'master' 
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-11 16:48:52 +00:00
Douwe Maan c814421f2a Merge branch 'update-gitlab-git' into 'master' 
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-11 15:05:51 +00: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
Yorick Peterse 077d379195 Updated gitlab_git to 9.0.1 
This includes gitlab-org/gitlab_git!69 and will hopefully solve
gitlab-org/gitlab-ce#13808.
 2016-03-08 11:18:07 +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