home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,833 Commits 48 Branches 340 Tags
f927e7280e0810eb568d13d80b2eddf0fc51c38d
Commit Graph
1752 Commits
Author SHA1 Message Date
James Lopez f927e7280e Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-05 15:25:21 +02:00
James Lopez 9c60eca87f fix wiki import 2016-05-05 15:23:59 +02:00
James Lopez 99a5d07c92 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-05 14:30:18 +02:00
James Lopez f11920e21d more fixes - restoring repo 2016-05-05 14:21:27 +02:00
James Lopez 4c0f9a54ec Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-05 13:21:04 +02:00
James Lopez 28ba2176dc fix issue restoring repo 2016-05-05 13:19:41 +02:00
James Lopez 65e0d37874 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-05 12:58:21 +02:00
James Lopez 7204018a36 fix path to bundle 2016-05-05 12:54:12 +02:00
James Lopez 21cfad245c Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-05 12:41:18 +02:00
James Lopez 92f4bde427 use git bundle in import and add wiki repo to import 2016-05-05 12:39:18 +02:00
James Lopez 43488d277e Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-05 12:02:36 +02:00
James Lopez 6612ca096a update repo and wiki repo bundler to use git bundle instead of compressing via tar 2016-05-05 12:01:18 +02:00
James Lopez e14d1051d2 fix import feature v2 2016-05-05 11:02:22 +02:00
James Lopez 7a531bb116 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-05-04 17:44:15 +02:00
James Lopez a4d242b887 refactored some namespace stuff and fixed project tree restorer spec. also removing controller so that it belongs to the UI MR 2016-05-04 17:42:02 +02:00
James Lopez 84c7b5185d Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-04 15:14:43 +02:00
James Lopez 773c39cca3 fixed import export reader spec 2016-05-04 15:13:44 +02:00
James Lopez 3929972d90 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 
# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb
 2016-05-03 13:14:31 +02:00
James Lopez 9d306eb132 picking stuff from ui related to import 2016-05-03 12:41:23 +02:00
James Lopez 548c91e3c5 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 
# Conflicts:
#	lib/gitlab/import_export/command_line_util.rb
 2016-05-03 11:34:13 +02:00
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
James Lopez 5a4f576359 fixing issues with project members mapping. Also added some more JS magic to the import page 2016-05-02 18:22:18 +02:00
James Lopez 07ab6c2e26 refactoring and fixing a bunch of stuff 2016-05-02 11:29:21 +02:00
James Lopez 7ebf22e002 more refactoring and fixes - fixing spec as well 2016-04-29 15:15:27 +02:00
James Lopez c46f3bcb51 few fixes and new integration spec -WIP 2016-04-29 13:11:07 +02:00
Zeger-Jan van de Weg ad99404d25 Properly handle bigger files 2016-04-28 21:28:39 +02:00
James Lopez c5bc262981 few fixes - import from UI working 2016-04-28 18:00:30 +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
James Lopez 5908bdf3ed fixing a few tar issues - and using gnu tar only 2016-04-28 13:53:16 +02: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
James Lopez cec4ae55b7 quite a few fixes - import service 2016-04-27 18:07:40 +02: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 cbbc42e0c4 adding more UI changes, updated controller, worker and refactored import service 2016-04-26 17:12:50 +02:00
James Lopez 4037a73894 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-04-25 18:06:24 +02:00
James Lopez 10f1609535 changes to be picked by the UI branch 2016-04-25 18:00:15 +02:00
James Lopez acf297955a gitlab import UI - icon, file selector, etc... Also updated font-awesome and modified import source settings. 2016-04-22 17:44:59 +02:00
James Lopez a0ede57dd6 Merge branches 'feature/project-export' and 'feature/project-import' into feature/project-export-ui-experimental 2016-04-22 15:29:35 +02:00
James Lopez fedfba5519 more refactoring - easier guessing path changes 2016-04-22 12:49:37 +02:00
James Lopez 8f973b8f68 more refactoring - easier guessing path changes 2016-04-22 12:45:20 +02:00
James Lopez 45032bf403 Merge branch 'feature/project-export' into feature/project-import 2016-04-22 12:18:47 +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
James Lopez 7614d230a2 fix conflicts 2016-04-21 17:28:56 +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