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
27,733 Commits 48 Branches 340 Tags
bc8eebf04a32d893d5b536deb2e7ffc205d9fcda
Commit Graph
1714 Commits
Author SHA1 Message Date
James Lopez 2a78e03ad5 Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-05-03 11:15:38 +02:00
James Lopez 58b0b1a661 picking export stuff from the UI branch 2016-05-03 11:13:10 +02:00
Zeger-Jan van de Weg ad99404d25 Properly handle bigger files 2016-04-28 21:28:39 +02:00
Rémy Coutable 5addff7e6c Merge branch 'use-remote-ip-for-akismet' into 'master' 
Use ActionDispatch Remote IP for Akismet checking

Previously all remote IPs appeared at 127.0.0.1, which made Akismet
not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html)
should provide more reliable results.

Closes #16629

See merge request !3961
 2016-04-28 13:09:44 +00:00
Stan Hu e99cf05875 Use ActionDispatch Remote IP for Akismet checking 
Previously all remote IPs appeared at 127.0.0.1, which made Akismet
not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html)
should provide more reliable results.

Closes #16629
 2016-04-27 22:12:55 -07:00
Stan Hu eede032345 Backport GitHub Enterprise import support from EE 
These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.
 2016-04-26 21:00:55 -07:00
James Lopez fedfba5519 more refactoring - easier guessing path changes 2016-04-22 12:49:37 +02:00
James Lopez 4256743686 refactored path stuff 2016-04-22 12:18:11 +02:00
Alfredo Sumaran 3b39214f29 Merge remote-tracking branch 'origin/master' into issue_14904 2016-04-21 12:47:32 -05:00
James Lopez 2d503f6410 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-04-21 17:37:33 +02:00
Jacob Vosmaer 103c405339 Use SIGTERM during Sidekiq memory shutdown 
This makes the memory killer behave more like 'sidekiqctl stop'.
 2016-04-21 14:49:15 +02:00
Jacob Schatz b3f4e8b218 Revert "Merge branch 'sentry-js' into 'master' " 
This reverts commit 0f309794e7, reversing
changes made to 1e596fef1c.
 2016-04-21 07:27:27 -04:00
Alfredo Sumaran 5c10b29700 Merge remote-tracking branch 'origin/master' into issue_14904 
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
 2016-04-20 17:26:47 -05:00
Robert Speicher 7e6d59067e Merge branch 'fix-grape-internal-allowed-action' into 'master' 
Fix setting of "action" for Grape transactions

After wondering why we're not getting all the data in Grafana that I
wanted I realized I wasn't setting the "action" field properly here.

See merge request !3842
 2016-04-20 21:27:43 +00:00
Yorick Peterse a257d117a0 Fix setting of "action" for Grape transactions 
Merely setting the "action" tag will only result in the transaction
itself containing a value for this tag. To ensure other metrics also
contain this tag we must set the action using Transaction#action=
instead.
 2016-04-20 22:42:52 +02:00
Robert Speicher 0f309794e7 Merge branch 'sentry-js' into 'master' 
Add Sentry logging for JavaScript errors

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675

See merge request !3795
 2016-04-20 19:52:27 +00:00
Alfredo Sumaran a45924348f Merge remote-tracking branch 'origin/master' into issue_14904 2016-04-20 12:24:42 -05:00
Sebastian Klier a88f0a1fd8 add wiki_page helper to url_builder 2016-04-20 08:25:41 +08:00
Arinde Eniola 3e7a8b0789 place the sentry config into a new file, and some changes 2016-04-19 22:04:52 +01:00
Yorick Peterse 229f3ce9ce Configuring of points per UDP packet 
This allows users to configure the number of points stored in a single
UDP packet. This in turn can be used to reduce the number of UDP packets
being sent at the cost of these packets being somewhat larger.

The default setting is 1 point per packet so nothing changes for
existing users.
 2016-04-19 14:35:25 +02:00
Gabriel MazettoandDmitriy Zaporozhets 5330af3fa6 Using single builder for push and tag events 2016-04-19 11:00:30 +02:00
Gabriel MazettoandDmitriy Zaporozhets ee1090e2b2 Added System Hooks for push and tag_push 
Code is based on Project Webhooks, removing deprecations and without
commits listing.
 2016-04-19 11:00:30 +02:00
Douglas Barbosa Alexandre f2fe4af19d Set GitHub milestones to Issue/Merge Request that were imported 2016-04-18 20:07:05 -03:00
Douglas Barbosa Alexandre 06ec511164 Import milestones from GitHub 2016-04-18 20:07:04 -03:00
Douglas Barbosa Alexandre 7462a8f90a Apply GitHub labels to Issue/Merge Request that were imported 2016-04-18 17:14:59 -03:00
Douglas Barbosa Alexandre 05a4f444c3 Import labels from GitHub 2016-04-18 17:14:59 -03:00
Alfredo Sumaran b41ddf9c69 Add shortcut_path to GonHelper module 2016-04-18 15:04:57 -05:00
Jacob Schatz 5f98fdcdc9 Add sentry logger to GitLab 2016-04-18 12:26:32 -04:00
Douglas Barbosa Alexandre d13bba44f0 Use GitHub Issue/PR number as iid to keep references 
With these changes we don’t lost the issue/pr references when importing
them to GitLab.
 2016-04-18 12:15:50 -03:00
Yorick Peterse 7e6f0ac0e0 Count the number of SQL queries per transaction 
Fixes gitlab-org/gitlab-ce#15335
 2016-04-18 14:53:13 +02:00
Yorick Peterse 7b6785b3b1 Use Module#prepend for method instrumentation 
By using Module#prepend we can define a Module containing all proxy
methods. This removes the need for setting up crazy method alias chains
and in turn prevents us from having to deal with all that madness (e.g.
methods calling each other recursively).

Fixes gitlab-org/gitlab-ce#15281
 2016-04-18 11:16:31 +02:00
Robert Speicher 2e4d9c1de6 Merge branch 'fix/project-import_url' into 'master' 
Fix for import_url fields on projects containing third-party credentials

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2658 

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13955

See merge request !3066
 2016-04-15 21:52:00 +00:00
Robert Speicher 34b0561560 Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' 
Use rugged to change HEAD

_Originally opened at !2850 by @pmq20._

Needless to invoke gitlab_shell here, which is slow.

See merge request !3705
 2016-04-15 16:44:21 +00:00
Rémy Coutable 8b7bf2a0e0 Merge branch 'rugged-delete-tag' into 'master' 
Delete tags via rugged

Improve the performance by directly using rugged instead of shelling out to a git operation.

See merge request !3748
 2016-04-15 14:42:05 +00:00
Robert Schilling 3c704c33e0 Delete tags via rugged 2016-04-15 16:05:04 +02:00
Robert Schilling 106c443e76 Remove unused backend methods 2016-04-15 13:30:33 +02:00
Rémy Coutable f8e8a61c9c Remove Gitlab::Shell#update_repository_head since it's not used anymore 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-15 11:38:59 +02:00
James Lopez 05985b49a4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-15 08:49:08 +02:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master' 
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
 2016-04-14 17:15:58 +00:00
James Lopez e5f7a54530 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-14 18:12:10 +02:00
Rémy Coutable dd9ced0af9 Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' 
Fix revoking of authorized OAuth applications

Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized.

Added a spec and also found that the `gon` variables were not being set for this view.

Closes #14370

See merge request !3690
 2016-04-14 15:26:09 +00:00
James Lopez 0852f539aa refactored stuff, added a save and compress all class and moved mostly everything to lib 2016-04-14 16:57:25 +02:00
Stan Hu e450892f56 Include GonHelper separately and remove created_at in factory 2016-04-14 07:25:27 -07:00
Stan Hu c7e384aab2 Add spec for deletion of authorized OAuth2 application 
Closes #14370

Move gon function into its own helper
 2016-04-14 07:24:58 -07:00
Rémy Coutable c71cdb194f Merge branch 'simplify-gitlab-url_builder-15202' into 'master' 
Refactor and expose only Gitlab::UrlBuilder.build(record)

```
$ git grep Gitlab::UrlBuilder

app/models/commit.rb:      url: Gitlab::UrlBuilder.build(self),
app/services/issues/base_service.rb:      issue_url = Gitlab::UrlBuilder.build(issue)
app/services/merge_requests/base_service.rb:      hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note)
lib/gitlab/note_data_builder.rb:        base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note)
spec/lib/gitlab/note_data_builder_spec.rb:    expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note))
spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do
```

Fixes #15202.

See merge request !3696
 2016-04-14 10:27:49 +00:00
James Lopez efff7e9e54 updated migration based on testing findings 2016-04-14 12:03:45 +02:00
Valery Sizov c0678f2d28 Merge branch 'redis_config_consistency' into 'master' 
Redis configuration consistency

Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e

See merge request !3697
 2016-04-13 18:34:11 +00:00
Valery Sizov 2244aaf98f Redis configuration consistency 2016-04-13 20:57:19 +03:00
Robert Speicher 2b28fa14b3 Merge branch 'redis_improvements' into 'master' 
Clean up ExclusiveLease

See merge request !3695
 2016-04-13 16:22:45 +00:00
Jacob Vosmaer f07316f27c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-13 17:38:59 +02:00