d5bfb93152
Merge branch 'fix_global_board_routes_39073' into 'master'
...
Remove "boards" from TOP_LEVEL_ROUTES
Closes #39073
See merge request gitlab-org/gitlab-ce!14861
2017-10-16 15:24:51 +00:00
980423f6da
Merge branch 'git-env-handle-arrays' into 'master'
...
Add Gitlab::Git::Env.to_env_hash
See merge request gitlab-org/gitlab-ce!14841
2017-10-16 12:37:02 +00:00
e73af42239
Add Gitlab::Git::Env.to_env_hash
2017-10-16 13:19:44 +02:00
b2553840e8
Merge branch 'conflict-resolution-refactor' into 'master'
...
Conflict resolution refactor
See merge request gitlab-org/gitlab-ce!14747
2017-10-16 10:36:06 +00:00
3a7623fc01
Merge branch 'fix_diff_parsing' into 'master'
...
Fix diff parser so it tolerates to diff special markers in the content
Closes #34431
See merge request gitlab-org/gitlab-ce!14848
2017-10-16 10:11:55 +00:00
57d34848db
Fix confusing double usage of 'metadata'
2017-10-16 09:21:42 +00:00
f530261773
Popen with a timeout
2017-10-16 09:11:31 +00:00
076231798d
Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-count' into 'master'
...
Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count`
Closes #38960
See merge request gitlab-org/gitlab-ce!14807
2017-10-16 08:12:46 +00:00
d09895a0de
Fix diff parser so it tolerates to diff special markers in the content
2017-10-15 17:00:36 +03:00
b0f98a2e8e
Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'
...
added date parameter for time tracking
See merge request gitlab-org/gitlab-ce!14866
2017-10-13 15:52:41 +00:00
0aff29f96b
Merge Merge Requests via Gitaly
2017-10-13 14:07:31 +02:00
c616200f82
Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'
...
Make "merge ongoing" check more consistent
Closes #39032
See merge request gitlab-org/gitlab-ce!14825
2017-10-13 11:10:47 +00:00
945e0684af
added date parameter for time tracking
2017-10-13 11:41:49 +01:00
4f76a2e573
Remove boards from the list of reserved top paths
2017-10-13 11:28:56 +03:00
b78954c13d
Simplify check for running job on Redis
2017-10-13 10:17:41 +02:00
9fdde3693b
Move line code generation into Gitlab::Git
...
Having a distinct class just for that was a bit overkill
2017-10-12 22:13:05 -03:00
faa9bd402d
Create a Gitlab::Git submodule for conlict-related files
...
Rename classes to (hopefully) clearer names while we're doing that.
2017-10-12 22:03:15 -03:00
3fcab51ebb
Refactor conflict resolution to contain git ops within Gitlab::Git
...
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
2017-10-12 22:03:14 -03:00
9cc15172de
Clean hierarchy of calls between models and Gitalb::Git for blob search
2017-10-12 22:03:09 -03:00
f72598b659
Move Gitlab::Diff::LineCode to module Gitlab::Git
2017-10-12 21:45:16 -03:00
9fda629a34
Encapsulate git operations for conflict resolution into lib
2017-10-12 21:45:15 -03:00
05f46b820e
Merge branch 'fix/rugged-alternate-paths' into 'master'
...
Fix the format of rugged alternate directory list
Closes #39046
See merge request gitlab-org/gitlab-ce!14840
2017-10-12 15:37:14 +00:00
400557f0ba
Merge branch 'gitaly-fetch-remote' into 'master'
...
Add `Gitlab::Git::Repository#fetch` command
Closes gitaly#586
See merge request gitlab-org/gitlab-ce!14772
2017-10-12 14:53:32 +00:00
d964eb11a3
Merge branch 'cache-issuable-template-names' into 'master'
...
Cache issuable template names
See merge request gitlab-org/gitlab-ce!14823
2017-10-12 13:48:31 +00:00
b7303b65b1
Cache issuable template names
...
We were looking these up on each request to an issue page, because the form is
pre-filled, as is the template dropdown. That was unnecessary: we could just
treat these as 'special' repository files (like the rendered README) and cache
them in Redis until they change on a push.
2017-10-12 13:26:03 +01:00
a24abf39bf
Fix the format of rugged alternate directory list
...
Fixes #39046
2017-10-12 14:20:04 +02:00
218e1f0963
Match full file path in FileDetector
...
The basename appears to have been a holdover from the past - it doesn't look
necessary now. Some of the regexes were unanchored on one side, so explicitly
ensure that they only match the root.
Apart from that, this means that pushing to foo/README.md will no longer
invalidate the main README cache for a project.
2017-10-12 11:13:37 +01:00
ad5b96952e
Merge branch '39028-repo-by-url-fields' into 'master'
...
Add project fields to import project by url
Closes #39028
See merge request gitlab-org/gitlab-ce!14822
2017-10-12 08:05:49 +00:00
a6d09bc652
Merge branch 'fix/pass-git-object-dir-attrs-as-relative' into 'master'
...
Pass git object dir attributes as relative paths to Gitaly
Closes gitaly#629
See merge request gitlab-org/gitlab-ce!14713
2017-10-11 15:55:49 +00:00
457b135eb2
Update template description wording
2017-10-11 08:47:31 -07:00
a6b2387d3f
Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, instead of `Gcp::Cluster.count`
2017-10-11 23:02:47 +09:00
4378f56c7b
Pass git object dir attributes as relative paths to Gitaly
...
Fixes gitaly#629
2017-10-11 15:46:55 +02:00
565a2d7303
Merge branch '35580-cannot-import-project-with-milestones' into 'master'
...
fix the import :milestone from adding the group_id
Closes #35580
See merge request gitlab-org/gitlab-ce!14657
2017-10-11 10:46:05 +00:00
143ace07ad
Merge branch 'gitaly-has-local-branches' into 'master'
...
Use Gitaly's RepositoryService.HasLocalBranches RPC
See merge request gitlab-org/gitlab-ce!14753
2017-10-11 10:05:22 +00:00
1faa97b298
Merge branch 'fix/sm/move-callback-route-google_api-auth-callback-for-oauth-under' into 'master'
...
Move callback route(`google_api/auth/callback`) for Oauth under `-`
Closes #38911
See merge request gitlab-org/gitlab-ce!14802
2017-10-11 09:55:47 +00:00
bd0248307d
Simplify project page
2017-10-11 09:07:19 +00:00
1f14e9c2bc
Remove unnecessary TOLLEVEL routes from path_regex.rb
2017-10-11 16:36:59 +09:00
06e7eeb1c2
Use Gitaly's RepositoryService.HasLocalBranches RPC
2017-10-10 14:26:32 -03:00
377c10b493
Merge branch 'feature/migrate-workhorse-send-git-diff-patch-to-gitaly' into 'master'
...
Migrate Workhorse Send{Diff,Patch} to Gitaly
See merge request gitlab-org/gitlab-ce!14652
2017-10-10 11:02:25 +00:00
1731934398
Add `Gitlab::Git::Repository#fetch` command
2017-10-09 18:25:24 -03:00
f070265a6d
Introduce new hook data builders for Issue and MergeRequest
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-09 16:44:47 +02:00
075d651604
Start adding Gitlab::HookData::IssuableBuilder
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-09 15:07:10 +02:00
618dd9e4b2
Migrate Workhorse Send{Diff,Patch} to Gitaly
2017-10-09 14:18:05 +02:00
392e5df796
Don't create fork networks for root projects that are deleted
2017-10-09 08:44:23 +02:00
01d7335b43
Merge branch '38890-fix-gpg-signature-updater-when-commit-is-missing' into 'master'
...
Fix error with GPG signature updater when commit was deleted
Closes #38890
See merge request gitlab-org/gitlab-ce!14749
2017-10-07 19:16:18 +00:00
ac5784368f
Sync up hard coded DN class in migration
2017-10-07 10:28:13 -07:00
2df7d03586
Redefine `respond_to?` in light of `method_missing`
2017-10-07 10:28:13 -07:00
e0a0c6b04e
Make internal methods private
2017-10-07 10:28:13 -07:00
8c29a04549
Leave bad DNs alone instead of raising errors
2017-10-07 10:28:13 -07:00
1d1ad7e0b6
Refactor DN error classes
2017-10-07 10:28:13 -07:00
Douwe Maan
Sean McGivern
Jacob Vosmaer
Andrew Newdigate
Kamil Trzciński
Valery Sizov
Vlad
Oswaldo Ferreira
Alejandro Rodríguez
Dmitriy Zaporozhets
Sean McGivern
Ahmad Sherif
Tim Zallmann
Annabel Dunstone Gray
Shinya Maeda
Rémy Coutable
Robert Speicher
Bob Van Landuyt
Stan Hu
Michael Kozono