home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,055 Commits 48 Branches 340 Tags
dd86c91c730cfee6edbc6ed1708caa85056cea91
Commit Graph
619 Commits
Author SHA1 Message Date
James Lopez 08f237516b Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-18 17:53:03 +02:00
James Lopez a5f04ad488 fixed CI commits on export 2016-05-18 17:48:15 +02:00
James Lopez 834c953750 fix merge conflicts 2016-05-16 11:22:59 +02:00
James Lopez f386d7a7b7 some changes based on MR feedback 2016-05-16 10:13:00 +02:00
James Lopez 220e55a980 fix spec 2016-05-13 20:58:27 +02:00
James Lopez 1eb802cde3 fixed leaving comments on notes about missing authors 2016-05-13 16:25:27 +02:00
James Lopez a868258269 update json and fix notes issue 2016-05-13 14:17:10 +02:00
James Lopez 25a1c6541a add message to notes about missing author on import 2016-05-13 12:33:13 +02:00
James Lopez 78cd39e480 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-12 14:34:07 +02:00
James Lopez 8165e52045 add author on notes to export - so we can add to a note if project member is not found 2016-05-12 14:27:41 +02:00
James Lopez a61456e44e refactored import to use shared error stuff and fixed a few issues with recent refactorings 2016-05-11 17:22:45 +02:00
James Lopez 6fa529e981 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-10 17:18:04 +02:00
James Lopez a5d59f075a added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver 2016-05-10 17:15:20 +02:00
James Lopez e6fcd6d5bd fixed more import merging issues 2016-05-10 12:30:45 +02:00
James Lopez 47cd14b560 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-09 18:01:06 +02:00
James Lopez 3f87387b6f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 
# Conflicts:
#	app/models/project.rb
 2016-05-09 12:19:33 +02:00
James Lopez 3aee167dcc fixed issues after refactor, spec passing 2016-05-09 11:10:12 +02:00
James Lopez 8ac53eb5d0 started refactoring import export reader - WIP 2016-05-06 17:55:06 +02:00
James Lopez 49cdb778a1 few fixes to import specs and code 2016-05-06 15:18:25 +02:00
James Lopez 4290e9c8dd Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 
# Conflicts:
#	lib/gitlab/import_export/import_export.yml
 2016-05-06 14:45:15 +02:00
James Lopez ce598b0541 fixed and refactored a few things based on MR feedback 2016-05-06 13:40:02 +02:00
Robert Speicher 4fce876542 Merge branch 'fix/import-url-issues' into 'master' 
Fix importer bug when throwing exceptions

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

See merge request !3941
 2016-05-05 22:27:40 +00:00
Douglas Barbosa Alexandre 6fbf6b2936 Fix the line code when importing PR review comments from GitHub 
Pull Request Review Comments are comments on a portion of the unified
diff.
 2016-05-05 10:45:14 -03: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 e172028a36 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-03 13:07:16 +02:00
James Lopez 1990616a21 fixed warning 2016-05-03 13:06:00 +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
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 9a9681772c fix failing spec 2016-04-28 11:40:23 +02:00
James Lopez 8793025dd0 added spec testing exception raised 2016-04-28 10:26:44 +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
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 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
Kamil Trzciński d240666800 Merge branch 'ci-commit-as-pipeline' into 'master' 
Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob

ci_commits -> pipelines
ci_builds -> jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653
 2016-04-21 08:10:37 +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
Sebastian Klier edd07e2363 Fix wiki tests 2016-04-20 08:25:41 +08:00
Kamil Trzcinski 27e0c7723c Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 
# Conflicts:
#	db/schema.rb
 2016-04-19 14:00:14 -04: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 0ed0758735 Use double instead of OpenStruct in the Issue/PR formatters specs 2016-04-18 20:07:05 -03: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 05a4f444c3 Import labels from GitHub 2016-04-18 17:14:59 -03: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
Kamil Trzcinski 065e0c0fe4 Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 
# Conflicts:
#	db/schema.rb
 2016-04-16 19:55:14 +02: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