home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,795 Commits 48 Branches 340 Tags
720ef51bd97f478dba2d2c1b59df958dabd7500a
Commit Graph
771 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets e933a50b6b Merge branch 'remove-newrelic' into 'master' 
Remove newrelic gem. Closes #12860



See merge request !2682
 2016-02-04 12:11:51 +00:00
Patricio Cano ea7bdc78ee Updated omniuath-saml to the latest version. 2016-02-03 11:17:14 -05:00
Josh Frye 531767175f Remove newrelic gem. Closes #12860 2016-02-03 09:22:21 -05:00
Robert Speicher 8a85906a74 Merge branch 'support-akismet' into 'master' 
Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266
 2016-02-03 01:26:30 +00:00
Dmitriy Zaporozhets 5af15baae6 Merge branch 'update-newrelic-gem' into 'master' 
Bump New Relic gem version to avoid warnings in Web page

This version has support for Grape, so we should consider removing
the newrelic-grape gem as well:

https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation

See merge request !2578
 2016-02-02 16:09:32 +00:00
Jacob Vosmaer d3affe8bca Merge remote-tracking branch 'origin/master' into lazy-blobs 2016-02-02 15:04:54 +01:00
Jacob Vosmaer e08aa3df90 Use gitlab_git 8.0.0 2016-02-02 15:04:50 +01:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API 
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
 2016-02-02 11:25:44 -02:00
Stan HuandRémy Coutable f86ddfd365 Render sanitized SVG images 
Closes https://github.com/gitlabhq/gitlabhq/issues/9265
 2016-02-01 18:25:32 +01:00
Jacob Vosmaer d11d425acc Develop with a custom gitlab_git branch 2016-02-01 14:00:28 +01:00
Stan Hu 2828274b41 Remove newrelic_grape gem since the New Relic gem now provides native support: 
https://docs.newrelic.com/docs/agents/ruby-agent/frameworks/grape-instrumentation
 2016-01-30 04:17:14 -08:00
Stan Hu 026c31dafc Bump New Relic gem version to avoid warnings in Web page 2016-01-30 04:17:14 -08:00