home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,914 Commits 48 Branches 340 Tags
ae25c19ee5dcfae8ea977b2014657ecc6c3eaf3d
Commit Graph
799 Commits
Author SHA1 Message Date
Douwe Maan 1c65019742 Merge branch 'stanhu/gitlab-ce-bump-mailroom' 2016-05-05 14:34:04 +02:00
Rémy Coutable 275c615557 Merge branch 'revert-devise-async' into 'master' 
Revert "Remove the Devise Async gem."

This reverts commit 1cc614f2bd.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.

Resolves #17250.

See merge request !4027
 2016-05-04 13:55:00 +00:00
Connor Shea 3004386b55 Revert "Remove the Devise Async gem." 
This reverts commit 1cc614f2bd.

It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
 2016-05-03 15:43:51 -06:00
Connor Shea 66d7acfe4d Update rspec-rails from 3.3.3 to 3.4.2. 
This allows the removal of the monkey patch from this commit: 47ff1c5608

It'll also make it slightly easier to upgrade to 3.5.0 later.

Changelog: https://github.com/rspec/rspec-rails/blob/master/Changelog.md#340--2015-11-11
 2016-05-01 13:44:50 -06:00
Stan Hu 6243a83411 Bump mail_room to 0.7.0 to fix stuck IDLE connections 
Closes #13357
 2016-04-30 22:36:26 -07:00
connorshea a94b71c301 Upgrade Doorkeeper from 2.2.2 to 3.1.0 
I’d rather upgrade one major version at a time, so Doorkeeper needs to
be upgraded to 3.x before it can be upgraded to 4.x (which includes
Rails 5 support).

Changelog:
https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#310
 2016-04-28 11:43:39 -06:00
Dmitriy Zaporozhets 47d269c1aa Merge branch 'rs-letter_opener_web' into 'master' 
Add letter_opener_web gem

Sent emails in the development environment will no longer automatically
be opened in the browser. If a sent email needs to be viewed, it can be
found at the `/rails/letter_opener` route.

See merge request !3893
 2016-04-27 13:23:40 +00:00
Connor Shea 1cc614f2bd Remove the Devise Async gem. 
The extra gem isn’t necessary anymore since Rails 4.2 has ActiveJob integration.

Resolves #15575.
 2016-04-26 10:41:48 -06:00
Robert Speicher c295f0d2cc Merge branch 'update-jquery-rails' into 'master' 
Upgrade jQuery Rails from 4.0.5 to 4.1.1

Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1.

Changelogs:
- https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md
- https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/
- https://github.com/rails/jquery-ujs/releases

See merge request !3642
 2016-04-25 16:12:08 +00:00
Luke Howell 2dd4f796b1 Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates. 2016-04-24 14:14:29 -05:00
Robert Speicher 702380f1ae Add letter_opener_web gem 
Sent emails in the development environment will no longer automatically
be opened in the browser. If a sent email needs to be viewed, it can be
found at the `/rails/letter_opener` route.
 2016-04-22 16:13:59 -04:00
Robert Speicher 3d4875f86a Merge branch 'license-templates-and-api-12804' into 'master' 
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 2016-04-20 01:38:49 +00:00
Douglas Barbosa Alexandre 5f39729c19 Update octokit gem to version 4.3.0 2016-04-18 17:02:40 -03:00
Rémy Coutable 2f18c77e1b Update to licensee 8.0.0 and fix API specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-18 14:47:50 +02:00
Anton DavydovandRémy Coutable 073c3d15c7 Initial implementation if license template selector and /licenses/:key API endpoint 2016-04-18 14:47:50 +02:00
Robert Speicher 42a391f744 Update spring and spring-commands-spinach 
Spring changelog: https://git.io/vVAUY
 2016-04-12 14:28:07 -04:00
connorshea a153a1d6fb Upgrade jQuery Rails from 4.0.5 to 4.1.1 
Upgrades jQuery to 1.12.1 and jquery-ujs to 1.2.1.

Changelogs:
https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md
https://blog.jquery.com/2016/01/08/jquery-2-2-and-1-12-released/
https://github.com/rails/jquery-ujs/releases
 2016-04-10 21:57:42 -06: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