root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
52,612 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

112 Commits

Author SHA1 Message Date
Douwe Maan 6319ca271c Merge branch 'gitaly-local-branches' into 'master' 
Incorporate Gitaly's local_branches operation into repo code

Closes #27379

See merge request !10059
 2017-05-18 14:22:41 +00:00
Alejandro Rodríguez 925945f01b Incorporate Gitaly's local_branches operation into repo code 2017-05-17 18:12:10 -04:00
Alejandro Rodríguez 71569a9c41 Compare ids of commits if present for equality test 
This solves a problem where commits populated with Gitaly were not equal
to commits populated with Rugged. This is because Gitaly may not return
all fields of a commit for optimizations purposes, which resulted in
false negatives when comparing the same commit (commits with the same
sha) with different sources.
 2017-05-16 20:54:45 -04:00
Alejandro Rodríguez cf09c826a5 Re-enable gitaly migration for ref_name_for_sha after bugfixes 2017-05-16 11:43:37 -04:00
Douwe Maan ffabab80a7 Merge branch 'use-gitaly-migrate' into 'master' 
Use gitaly_migrate helper on all current migrations in repository

See merge request !11309
 2017-05-15 18:26:55 +00:00
Jacob Vosmaer 43f037c903 Don't reuse gRPC channels 
It seems that bad things happen when two gRPC stubs share one gRPC
channel so let's stop doing that. The downside of this is that we
create more gRPC connections; one per stub.
 2017-05-15 10:52:33 +02:00
Ahmad Sherif 99feed6e00 Add support for deltas_only under Gitaly 
Closes gitaly#199
 2017-05-13 18:27:06 +02:00
Alejandro Rodríguez 6d46e51031 Use gitaly_migrate helper on all current migrations in repository 2017-05-11 16:48:59 -03:00
Jacob Vosmaer 27fb64d6a3 Remove deltas_only from DiffCollection 2017-05-11 16:01:10 +02:00
Rémy Coutable 3db37e0562 Enable the Style/TrailingCommaInArguments cop 
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-05-10 18:25:45 +02:00
Rémy Coutable d40e1f547e Enable the Style/TrailingCommaInLiteral cop 
Use the EnforcedStyleForMultiline: no_comma option.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-05-10 18:25:45 +02:00
Sean McGivern c1174901c6 Merge branch 'deltas-only' into 'master' 
Don't use DiffCollection for deltas

See merge request !11201
 2017-05-09 15:38:38 +00:00
Jacob Vosmaer fc0e00bd3c Remove some unused Gitlab::Git code 2017-05-09 14:51:19 +02:00
Jacob Vosmaer 48254d187f Don't use DiffCollection for deltas 2017-05-09 12:27:17 +02:00
Douwe Maan 37b1b14a16 Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' 
Sort the network graph both by commit date and topographically

Closes #30973

See merge request !11057
 2017-05-04 13:56:58 +00:00
Timothy Andrew b44eaf8e07 Sort the network graph both by commit date and topographically. 
- Previously, we sorted commits by date, which seemed to work okay.

- The one edge case where this failed was when multiple commits have the same
  commit date (for example: when a range of commits are cherry picked with a
  single command, they all have the same commit date [and different author
  dates]).

- Commits with the same commit date would be sorted arbitrarily, and usually
  break the network graph.

- This commit solves the problem by both sorting by date, and by sorting
  topographically (parents aren't displayed until all their children are
  displayed)

- Include review comments from @adamniedzielski

A more detailed explanation is present here:
https://gitlab.com/gitlab-org/gitlab-ce/issues/30973#note_28706230
 2017-05-04 04:21:12 +00:00
Douwe Maan 4faa65d838 Merge branch '31671-merge-request-message-contains-carriage-returns' into 'master' 
removes the possibility of commit messages having carriage returns

Closes #31671

See merge request !11077
 2017-05-03 22:25:50 +00:00
Tiago Botelho 268ec199da removes the possibility of commit messages having carriage returns 2017-05-03 21:25:57 +01:00
Douwe Maan 720cc14a75 Refactor Blob support of external storage in preparation of job artifact blobs 2017-05-03 10:20:05 -05:00
Alejandro Rodríguez 5e0e5801f1 Re-enable ref operations with gitaly after not-found fix 2017-05-02 17:17:58 -03:00
Sean McGivern 780dcf9cdb Merge branch 'gitaly-branch-tag-count' into 'master' 
Use Gitaly for getting Branch/Tag counts

Closes gitaly#157

See merge request !10780
 2017-05-02 13:17:51 +00:00
Kim "BKC" Carlbäcker fe771b51fd Fix Gitaly::Commit#is_ancestor 
- Upgrade Gitaly-version
 2017-04-28 16:44:41 +02:00
Kim "BKC" Carlbäcker 6f89bd3628 Use Gitaly for getting Branch/Tag counts 
- Backup-rake-spec fixed. Storage config broken
- Use rugged to compare branch/tag-count in specs
- upgrade gitaly
 2017-04-28 13:07:53 +02:00
Douwe Maan b73b16798d Small code tweaks 2017-04-27 12:23:26 -05:00
Timothy Andrew a7e67604b3 Fix ordering of commits in the network graph. 
- We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1

- Prior to this upgrade, the default sort order for commits returned by
  `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the
  graph relied on.

- While upgrading `rugged`, the MR also changed this default to
  `Rugged::SORT_NONE`, which broke commit ordering in the graph.

- This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort
  by date, and changes the graph builder `Network::Graph` so it explictly
  requests the `:date` sort order
 2017-04-27 13:09:54 +00:00
James Lopez 71b6a4ba85 Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING error 2017-04-20 16:10:33 +02:00
Douwe Maan d170133bde Refactor changing files in web UI 2017-04-20 00:37:44 +00:00
Douwe Maan d40970bf5e Normalize sizes in Gitlab::Git::Blob 2017-04-17 13:44:31 -05:00
Rémy Coutable c43f7d4713 Merge branch 'gitaly-testing' into 'master' 
Setup and run a Gitaly server for testing if GitalyClient is enabled

See merge request !10298
 2017-04-12 09:25:09 +00:00
Alejandro Rodríguez d6cc8feb6c Setup and run a Gitaly server for testing if GitalyClient is enabled 2017-04-11 16:00:44 -03:00
Rémy Coutable ae88355bb8 Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs method 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-10 16:10:18 +02:00
Rémy Coutable cb20cfa244 Retrieve Git-specific env in Gitlab::Git::Repository#rugged 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-10 16:10:18 +02:00
Rémy Coutable 05aa038c42 Add a Gitlab::Git::Env to store Git-specific env thread-safely 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-10 16:10:18 +02:00
Jacob Vosmaer 20d415a676 Use Gitlab::Git::Repository#gitaly_... more 2017-04-07 12:53:30 +02:00
Jacob Vosmaer e4ac948c70 Send more Gitaly::Repository fields 2017-04-07 12:53:30 +02:00
Kim "BKC" Carlbäcker 70982bb420 Hopefully this works 2017-04-06 12:10:03 +02:00
Kim "BKC" Carlbäcker 0fc361c4dc Use Gitaly for Environment#first_deployment_for 2017-04-06 11:53:34 +02:00
Alejandro Rodríguez 267cd3e359 Incorporate Gitaly client for refs service 2017-04-04 16:53:44 +02:00
Douwe Maan b2700e64cc Merge branch '22303-symbolic-in-tree' into 'master' 
#22303 fix mode representation git::tree ( in base 8 )

Closes #22303

See merge request !9780
 2017-04-03 15:59:24 +00:00
Robert Speicher e7e9307219 Merge branch 'use-gitaly-commit-is-ancestor' into 'master' 
Use gitaly commit is ancestor

See merge request !9864
 2017-04-02 17:36:25 +00:00
mhasbini ed5d59d4c4 Fix symlink icon in project tree 2017-04-02 14:42:37 +03:00
Robert Speicher bf0590b3e2 Merge branch 'allow-multiple-paths-in-repository-log' into 'master' 
Support >1 path in Gitlab::Git::Repository#log

See merge request !10291
 2017-03-30 14:56:43 +00:00
Kim "BKC" Carlbäcker 1ea0ce827a Make GitLab use Gitaly for commit_is_ancestor 
- Migration in Repository#is_ancestor?
 2017-03-30 16:06:31 +02:00
Sean McGivern 53819c5ac6 Support >1 path in Gitlab::Git::Repository#log 
This is analogous to `git log -- foo bar baz`, but not the same as
`Gitlab::Git::Repository#log(path: 'foo bar baz')`, which would run `git
log -- 'foo bar baz'`.
 2017-03-30 10:21:19 +01:00
Adam Niedzielski 91e150266a Use Rugged::SORT_NONE instead of Rugged::SORT_DATE 
Meaning of SORT_DATE was changed in libgit2.
See 82d4c0e6b8

SORT_NONE is the order produced by "git log".
 2017-03-28 14:19:52 +02:00
Adam Niedzielski e396b43771 Remove unused method Gitlab::Git::Repository#commits_since 2017-03-28 14:19:52 +02:00
Robert Speicher 5409a3c5b7 Merge branch 'feature/use-gitaly-for-commit-show' into 'master' 
Use Gitaly for CommitController#show

See merge request !9629
 2017-03-17 17:41:44 +00:00
Mark Fletcher 4597654079 Fix archive prefix bug for refs containing dots 2017-03-16 21:04:58 +05:30
Ahmad Sherif c0a4f527db Use Gitaly for CommitController#show 2017-03-15 12:52:11 +02:00
Oswaldo Ferreira d13451cd49 Returns correct header data for commits endpoint 2017-03-07 22:56:31 -03:00