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

179 Commits

Author SHA1 Message Date
Rémy Coutable 8efc884166 Merge branch 'gitaly-tree-entries' into 'master' 
Incorporate CommitService.GetTreeEntries Gitaly call

Closes gitaly#372

See merge request !12941
 2017-07-21 15:47:36 +00:00
Ahmad Sherif b043100b65 Migrate Gitlab::Git::Commit.find_all to Gitaly 
Closes gitaly#396
 2017-07-20 22:03:55 +02:00
Alejandro Rodríguez 9eb5cdd73f Incorporate CommitService.GetTreeEntries Gitaly call 2017-07-20 12:47:00 -04:00
Ahmad Sherif ef2b81adb4 Migrate DiffCollection limiting logic to Gitaly 2017-07-19 18:05:22 +02:00
Alejandro Rodríguez 25b01b4c85 Incorporate Gitaly's Commits#between RPC 2017-07-18 16:20:27 -04:00
Alejandro Rodríguez 90f8feae46 Adapt to new Gitaly commit message format 2017-07-18 16:11:44 -04:00
Andrew Newdigate a89f18bf2c Renamed Gitaly services 2017-07-18 07:59:36 +00:00
Sean McGivern 8b31ecd3d9 Merge branch 'remove-git-search-files' into 'master' 
Remove Repository#search_files

See merge request !12879
 2017-07-17 11:13:49 +00:00
Jacob Vosmaer 682b328787 Remove Repository#search_files 2017-07-14 18:17:31 +02:00
Jacob Vosmaer 8ca394b8d7 Gitaly migration annotations 2017-07-14 17:08:54 +02:00
Jacob Vosmaer 48a2c680b6 Use helper instead of ad-hoc regex 2017-07-14 17:08:53 +02:00
Jacob Vosmaer b304fd790b Make commit lookups explicit 2017-07-14 17:08:53 +02:00
Jacob Vosmaer 08b462b9b0 Remove deprecated #heads method 2017-07-14 15:11:42 +02:00
Jacob Vosmaer 000ec95399 Make branch filter support private 2017-07-14 15:08:33 +02:00
Jacob Vosmaer 5b18f73364 Indirectly migrate count_commits_between to Gitaly 2017-07-13 18:05:56 +02:00
Jacob Vosmaer a87cca5f9c More Gitaly annotations 2017-07-13 18:05:55 +02:00
Jacob Vosmaer b2ecf0aa35 Change Git::Repository#log to return Commits 2017-07-13 14:54:21 +02:00
Sean McGivern e0ce648d5c Merge branch 'lib-git-gitaly' into 'master' 
Add Gitaly notes to Gitlab::Git, delete diff options

See merge request !12814
 2017-07-13 09:32:36 +00:00
Jacob Vosmaer 0b0e89ef7b Try to eliminate unused diff options 2017-07-12 18:28:29 +02:00
Jacob Vosmaer 47c844bf34 Add Gitaly notes and annotations to Gitlab::Git 2017-07-12 17:06:31 +02:00
Clement Ho 8119c444b3 Add namespace for Blob 2017-07-11 16:06:38 -05:00
Jacob Vosmaer 17d7d3de5d Add git_blob_load_all_data feature flag 2017-07-07 18:36:14 +02:00
Jacob Vosmaer 06b9449224 Add gitaly_git_blob_raw feature 2017-07-07 18:33:59 +02:00
Robert Speicher 1dab640357 Merge branch 'feature/migrate-commit-count-to-gitaly' into 'master' 
Migrate Gitlab::Git::Repository#commit_count to Gitaly

Closes gitaly#355

See merge request !12688
 2017-07-07 15:21:05 +00:00
Ahmad Sherif c393d88df3 Migrate Gitlab::Git::Repository#commit_count to Gitaly 
Closes gitaly#355
 2017-07-07 13:47:34 +02:00
Douwe Maan 793ce6fef6 Merge branch '32408-allow-creation-of-files-and-dirs-with-spaces-in-web-ui' into 'master' 
Make filename and path creation compatible with UNIX in web UI

Closes #21362

See merge request !12608
 2017-07-05 20:21:58 +00:00
Tiago Botelho 1207d451ed Removes file_name_regex from Gitlab::Regex 2017-07-05 19:10:14 +01:00
Sean McGivern 9e4aef263a Merge branch 'gitaly-submodule-url-for' into 'master' 
Migrate #submodule_url_for to Gitaly

See merge request !12629
 2017-07-05 11:25:39 +00:00
Jacob Vosmaer b67d1d64cc Migrate #submodule_url_for to Gitaly 2017-07-05 11:09:03 +02:00
Douwe Maan 82614f8675 Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths 2017-07-04 15:16:34 -05:00
Alejandro Rodríguez f4e6aba1bb Set the GL_REPOSITORY env variable on Gitlab::Git::Hook 2017-06-29 15:22:40 -04:00
Jacob Vosmaer d3bcf8ac2a Fix gitaly ref encoding bugs 2017-06-28 16:15:59 +02:00
Sean McGivern 5dd6d9a9ec Merge branch 'submodules-private' into 'master' 
Make Gitlab::Git::Repository#submodules private

See merge request !12479
 2017-06-28 09:25:45 +00:00
Jacob Vosmaer cf131bf713 Make Gitlab::Ggit::Repository#submodules private 2017-06-27 16:03:35 +02:00
Jacob Vosmaer 43c3a65062 Remove 'contains' option from Commit.find_all 2017-06-27 12:38:58 +02:00
Jacob Vosmaer 144e37c667 Remove Gitlab::Git::Repository#find_all 2017-06-27 12:30:51 +02:00
Jacob Vosmaer 2bad43f5ee Remove unused Gitlab::Git::Commit#to_diff argument 2017-06-26 18:50:26 +02:00
Robert Speicher 826d5b7b51 Merge branch 'fix/properly-encode-gitaly-diffs' into 'master' 
Encode Gitaly diff patches properly

See merge request !12368
 2017-06-22 16:50:30 +00:00
Ahmad Sherif 5b092d21cc Encode Gitaly diff patches properly 2017-06-22 03:12:23 +02:00
Ahmad Sherif 0284f01716 Migrate Gitlab::Git::Blob.find to Gitaly 2017-06-21 17:31:20 +02:00
Sean McGivern 3656f6cc40 Merge branch 'remove-git-commit-attribute' into 'master' 
Remove unused attr_accessor from Gitlab::Git::Commit

See merge request !12311
 2017-06-21 08:30:36 +00:00
Jacob Vosmaer d66d126382 Remove unused attr_accessor from Gitlab::Git::Commit 2017-06-20 17:20:02 +02:00
Rémy Coutable 2a39280db0 Merge branch 'moved-submodules' into 'master' 
repository: index submodules by path

See merge request !10798
 2017-06-19 17:51:55 +00:00
David Turner b30c16aa32 repository: index submodules by path 
Submodules have a name in the configuration, but this name is simply
the path at which the submodule was initially checked in (by default
-- the name is totally arbitrary).  If a submodule is moved, it
retains its original name, but its path changes.  Since we discover
submodules inside trees, we have their path but not necessarily their
name.

Make the submodules() function return the submodule hash indexed by
path rather than name, so that renamed submodules can be looked up.

Signed-off-by: David Turner <novalis@novalis.org>
 2017-06-16 14:37:13 -04:00
Sean McGivern 9a73b634ab Add table for files in merge request diffs 
This adds an ID-less table containing one row per file, per merge request
diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised
currently, with the advantage that we can easily query the attributes of this
new table.

It does not migrate existing data, so we have fallback code when the legacy
st_diffs column is present instead. For a merge request diff to be valid, it
should have at most one of:

* Rows in this new table, with the correct merge_request_diff_id.
* A non-NULL st_diffs column.

It may have neither, if the diff is empty.
 2017-06-16 18:30:01 +01:00
Douwe Maan 7944254563 Implement diff viewers 2017-06-14 10:12:21 -05:00
Douwe Maan e4038cb508 Merge branch 'cache-diff-size-limits' into 'master' 
Only look up diff size limit flags once per request

See merge request !12048
 2017-06-09 20:16:58 +00:00
Sean McGivern 9b42be02ab Only look up diff size limit flags once per request 2017-06-09 17:21:27 +01:00
Douwe Maan 370bc86fb0 Detect if file that appears to be text in the first 1024 bytes is actually binary afer loading all data 2017-06-08 12:49:03 -05:00
Douwe Maan ffbbd4112e Move diffable? method from Repository to Diff::File 2017-06-08 09:32:57 -05:00