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
50,997 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

92 Commits

Author SHA1 Message Date
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
George Andrinopoulos c46f933bb7 Fix pagination headers for repository commits api endpoint 2017-03-07 22:56:31 -03:00
Rémy Coutable d415419532 Merge branch '28805-download-archive-with-branch-like-feature-xxxx-add-extra-directory-level' into 'master' 
Ensure archive download is only one directory deep

Closes #28805

See merge request !9616
 2017-03-02 08:37:07 +00:00
Mark Fletcher 3ac54d22b9 Ensure archive download is only one directory deep 2017-03-02 10:30:24 +05:30
Sean McGivern 811e598f60 Enable and autocorrect the CustomErrorClass cop 2017-03-01 15:28:10 +00:00
Robert Speicher cecfcc2edd Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' 
Make Git history follow renames again by performing the --skip in Ruby

Closes #23062

See merge request !9314
 2017-02-25 19:58:05 +00:00
Douwe Maan c72e715522 Raise error when no content is provided 2017-02-24 09:55:01 -06:00
Douwe Maan a530e9da35 Address review 2017-02-24 09:55:01 -06:00
Douwe Maan 564b0eb017 Fix new offenses 2017-02-24 09:55:01 -06:00
Douwe Maan 0625af3bcb Consistently create, update, and delete files, taking CRLF settings into account 2017-02-24 09:55:01 -06:00
Rémy Coutable 9720bcd83d Optimize a bit Gitlab::Git::Repository#log_by_shell and its specs 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-02-23 19:06:00 +01:00
Rémy Coutable 3eb0354061 Make Git history follow renames again by performing the --skip in Ruby 
This hack is needed because of an issue when --follow and --skip
are passed to git log at the same time.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/23062

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-02-23 19:06:00 +01:00
Douwe Maan f88ff0cc0c Stylistic tweaks 2017-02-23 09:33:20 -06:00
Douwe Maan 56de781a2c Revert "Enable Style/DotPosition" 
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.

# Conflicts:
#	.rubocop.yml
#	.rubocop_todo.yml
#	lib/gitlab/ci/config/entry/global.rb
#	lib/gitlab/ci/config/entry/jobs.rb
#	spec/lib/gitlab/ci/config/entry/factory_spec.rb
#	spec/lib/gitlab/ci/config/entry/global_spec.rb
#	spec/lib/gitlab/ci/config/entry/job_spec.rb
#	spec/lib/gitlab/ci/status/build/factory_spec.rb
#	spec/lib/gitlab/incoming_email_spec.rb
 2017-02-23 09:33:19 -06:00
Douwe Maan 1fe7501b49 Revert "Prefer leading style for Style/DotPosition" 
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
 2017-02-23 09:33:05 -06:00
Douwe Maan b3ff48c9a1 Move up delegate calls 2017-02-23 09:32:42 -06:00
Douwe Maan 32a7041030 ActiveSupport delegation is preferred over Forwardable 2017-02-23 09:32:42 -06:00
Douwe Maan 75f5fa997d Enable Rails/Delegate 2017-02-23 09:32:42 -06:00
Douwe Maan 206953a430 Prefer leading style for Style/DotPosition 2017-02-23 09:32:22 -06:00
Douwe Maan 3dadf306dd Enable Style/DotPosition 2017-02-23 09:31:56 -06:00
Z.J. van de Weg 128b1eae09 Update Rubocop to ruby 2.3 2017-02-07 15:16:46 +01:00