home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
846 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 27b732abb1 Merge branch 'rs-update-unicorn' into 'master' 
Bump unicorn to `~> 4.9.0`

Closes #2820 

See merge request !2843
 2016-02-18 08:49:36 +00:00
Robert Speicher 594d21cdca Bump unicorn to ~> 4.9.0 2016-02-16 18:15:06 -05:00
Yorick Peterse 852bd109c1 Updated the allocations Gem to 1.0.4 
Sometimes the output of Allocations.to_hash may contain garbage. See
https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce
for more information.
 2016-02-15 13:03:42 +01:00
Takuya Noguchi 4646cbc4c6 Update omniauth to 1.3.1 for memory performance 2016-02-13 12:59:55 +09:00
Robert Speicher c880d877b8 Loosen Nokogiri version requirement 
Closes #13218
 2016-02-11 14:31:31 -05: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 b4e6ee7adc Update development version of gitlab_git 2016-02-01 15:19:55 +01:00
Jacob Vosmaer b1a7cb57cd Update gitlab_git@lazy-blob again 2016-02-01 14:41:35 +01:00
Jacob Vosmaer 29d376025d Update gitlab_git (lazy-blob branch) 2016-02-01 14:34:22 +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
Marin Jankovski 34a12e8cf9 Update sentry-raven gem. 2016-01-28 10:37:20 +01:00
Dmitriy Zaporozhets 5e48c1b851 Merge branch 'rs-bump-octokit' into 'master' 
Bump octokit to `~> 3.8.0`

Closes #2877

See merge request !2536
 2016-01-27 17:20:21 +00:00
Robert Speicher 484d14680d Update rails, rails-html-sanitizer, and nokogiri for security fixes 
See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643
 2016-01-25 13:34:13 -08:00
Valery Sizov 0f13933175 Merge branch 'rails_update' into 'master' 
Rails updated to 4.2.5

I hope it'll fix weird spec failing (according to https://github.com/rails/rails/pull/22383)

@dzaporozhets @yorickpeterse 

See merge request !2591
 2016-01-25 11:11:02 +00:00
Valery Sizov 4cfa119d5b rails updated to 4.2.5 2016-01-25 11:13:40 +02:00
Robert Speicher 8e14cb4b5a Bump octokit to ~> 3.8.0 
Closes #2877
 2016-01-21 12:51:24 -05:00
Yorick Peterse d21d8e57d3 Updated gitlab_git to 7.2.24 
Performance of Gitlab::Git::Repository was improved in merge request
gitlab-org/gitlab_git!62.
 2016-01-21 17:26:44 +01:00
Robert Speicher e3c43ca7d0 Merge branch 'sentry-integration' into 'master' 
Add sentry integration

Sentry is an event logging platform primarily focused on capturing and
aggregating exceptions. With this MR it will be possible to log and
track exceptions from GitLab to Sentry.

https://gitlab.com/gitlab-com/operations/issues/39

See merge request !2485
 2016-01-20 19:00:35 +00:00
James Lopez 419a5e00eb updated gitlab_git to fix issue #5858 and updated changelog 2016-01-20 17:12:30 +01:00
Jeroen Nijhof 7658a64469 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-integration 
Conflicts:
	db/schema.rb
 2016-01-20 09:07:10 +01:00
Douglas Barbosa Alexandre a936a1021f Update devise to version 3.5.4 2016-01-18 19:39:31 -02:00
Jeroen Nijhof 85e0fce9ee Add sentry integration 2016-01-18 17:15:10 +01:00
Stan Hu e34c621ea1 Bump fog to 1.36.0 
Closes #4231
 2016-01-11 08:41:11 -08:00
Robert Speicher 0f2e4198ec Add versions to omniauth_crowd and omniauth-azure-oauth2 
Also sorts them alphabetically, because OCD.
 2016-01-10 20:43:41 -05:00
Robert Speicher 59305715e9 Remove stamp gem 
Closes #5908
 2016-01-07 16:28:33 -05:00
Jacob Schatz 8f6ca70055 fixes ajax issue with issue spec 2016-01-07 12:27:01 -05:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Janis Meybohm da53fcba2d Enable Microsoft Azure OAuth2 support 2016-01-06 14:30:43 +01:00
Dmitriy Zaporozhets a2ba239fb4 Merge branch 'rs-bump-bootstrap-sass' into 'master' 
Bump bootstrap-sass to ~> 3.3.0

Resolves bootlint error:

`bootlint:  W013  Bootstrap version might be outdated. Latest version is at least 3.3.6 ; saw what appears to be usage of Bootstrap 3.3.5`

See merge request !2275
 2016-01-04 10:19:31 +00:00
Robert Speicher 2417f55467 Bump d3_rails to ~> 3.5.0 2016-01-01 21:34:49 -05:00
Robert Speicher 762210db6d Bump cal-heatmap-rails to ~> 3.5.0 2016-01-01 21:29:21 -05:00
Robert Speicher 93ef008500 Bump bootstrap-sass to ~> 3.3.0 2016-01-01 21:11:39 -05:00
Yorick Peterse 6d5202e2b6 Updated allocations Gem to version 1.0.3 2015-12-31 12:27:23 +01:00
Dmitriy Zaporozhets 540eb0a9af Merge branch 'influxdb' into 'master' 
Storing of application metrics in InfluxDB

This adds support for tracking metrics in InfluxDB, which in turn can be visualized using Grafana. For more information see #2936.

See merge request !2042
 2015-12-28 13:42:15 +00:00
Dmitriy Zaporozhets 202010e33f Merge branch 'add-recaptcha-support' into 'master' 
Add support for Google reCAPTCHA in user registration to prevent spammers

To do:

- [x] Failing reCAPTCHA test causes all the fields to be lost
- ~~[ ] Improve styling of reCAPTCHA box~~ (not possible)
- ~~[ ] Put settings in `application_settings` (?)~~

![image](/uploads/d38ca89820d3c0066fb8aeb645fd77f0/image.png)

![image](/uploads/6b050749963691b023d076682abcf736/image.png)

Page when you fail CAPTCHA:

![image](/uploads/bc4846f0a5144985bc41dfa75eeab4c1/image.png)


See merge request !2216
 2015-12-28 11:55:21 +00:00
Robert Speicher 7a20c6da91 Bump brakeman to ~> 3.1.0 2015-12-27 21:19:01 -05:00
Stan Hu 9f7d379c2a Add support for Google reCAPTCHA in user registration to prevent spammers 2015-12-27 09:04:11 -08:00
Robert Speicher fbca7d72d0 Bump underscore-rails to ~> 1.8.0 
Addresses #2857
 2015-12-23 14:05:45 -05:00