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

55 Commits

Author SHA1 Message Date
GitLab Bot 6323146895 Add latest changes from gitlab-org/gitlab@master 2023-12-21 15:12:00 +00:00
GitLab Bot 45465a1f21 Add latest changes from gitlab-org/gitlab@master 2023-12-15 00:12:58 +00:00
GitLab Bot fdc2b6184d Add latest changes from gitlab-org/gitlab@master 2023-12-12 03:16:05 +00:00
GitLab Bot 0bdb61ade7 Add latest changes from gitlab-org/gitlab@master 2023-09-22 00:11:47 +00:00
GitLab Bot 7e29b8f3fc Add latest changes from gitlab-org/gitlab@master 2023-09-21 09:10:54 +00:00
GitLab Bot bf53a3fd78 Add latest changes from gitlab-org/gitlab@master 2023-09-19 03:09:45 +00:00
GitLab Bot faa68a0289 Add latest changes from gitlab-org/gitlab@master 2023-08-30 15:11:17 +00:00
GitLab Bot 86ace8a66c Add latest changes from gitlab-org/gitlab@master 2022-08-25 09:09:51 +00:00
GitLab Bot 43c14d2d92 Add latest changes from gitlab-org/gitlab@master 2022-05-24 09:09:17 +00:00
GitLab Bot 67fa8362ae Add latest changes from gitlab-org/gitlab@master 2022-05-06 15:09:03 +00:00
GitLab Bot 48e30ea32f Add latest changes from gitlab-org/gitlab@master 2022-04-21 15:10:09 +00:00
GitLab Bot bc85eaf615 Add latest changes from gitlab-org/gitlab@master 2022-03-22 00:07:23 +00:00
GitLab Bot f8975b16d1 Add latest changes from gitlab-org/gitlab@master 2021-07-01 21:08:38 +00:00
GitLab Bot fba5aaeec6 Add latest changes from gitlab-org/gitlab@master 2021-01-25 21:09:03 +00:00
GitLab Bot c80b69a93f Add latest changes from gitlab-org/gitlab@master 2020-11-02 12:09:03 +00:00
GitLab Bot 62f486eb35 Add latest changes from gitlab-org/gitlab@master 2020-10-02 15:08:13 +00:00
GitLab Bot 1d3086ebb4 Add latest changes from gitlab-org/gitlab@master 2020-07-08 18:09:05 +00:00
GitLab Bot 100a5e4bea Add latest changes from gitlab-org/gitlab@master 2020-05-25 21:08:00 +00:00
gfyoung ebf98f27c4 Enable even more frozen string in lib/gitlab 
Enables frozen string for the following:

* lib/gitlab/fogbugz_import/**/*.rb
* lib/gitlab/gfm/**/*.rb
* lib/gitlab/git/**/*.rb
* lib/gitlab/gitaly_client/**/*.rb
* lib/gitlab/gitlab_import/**/*.rb
* lib/gitlab/google_code_import/**/*.rb
* lib/gitlab/gpg/**/*.rb
* lib/gitlab/grape_logging/**/*.rb
* lib/gitlab/graphql/**/*.rb
* lib/gitlab/graphs/**/*.rb
* lib/gitlab/hashed_storage/**/*.rb
* lib/gitlab/health_checks/**/*.rb

Partially address gitlab-org/gitlab-ce#47424.
 2018-11-13 11:42:15 -08:00
Alejandro Rodríguez c8ffd8b035 [ci skip] Fix documentation of Gitlab::Git::Diff#filter_diff_options flags 2018-10-17 17:39:16 -03:00
Oswaldo Ferreira 4fbca2a346 Make single diff patch limit configurable 
- Creates a new column to hold the single patch limit value on
application_settings
- Allows updating this value through the application_settings API
- Calculates single diff patch collapsing limit based on
diff_max_patch_bytes column
- Updates diff limit documentation
- Adds documentation (with warning) as of how one can update this limit
 2018-10-01 11:58:21 -03:00
Alejandro Rodríguez d3c5b07962 Remove Rugged and shell code from Gitlab::Git 2018-09-12 12:32:32 -03:00
Alejandro Rodríguez 4b87d80499 Fix merge requests not showing any diff files for big patches 2018-08-17 13:22:38 -03:00
🙈 jacopo beschi 🙉 c6b1043e9d Resolve "Make a Rubocop that forbids returning from a block" 2018-04-18 09:19:40 +00:00
Jacob Vosmaer (GitLab) 5c2fe2d3d7 Decouple more of Repository from Rugged 2018-01-30 16:21:55 +00:00
Sean McGivern a5d47bb063 Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" 
This reverts commit 1d3c33b57e.
 2017-10-02 13:54:40 +01:00
Ahmad Sherif eb36fa17a6 Migrate Gitlab::Git::Repository#diff to Gitaly 
Closes gitaly#524
 2017-09-21 11:05:06 +02:00
micael.bergeron a6af5522d7 renames ambiguous methods and add spec 2017-09-06 09:01:53 -04:00
micael.bergeron dbaed90c8d fix refactoring error with Blob.binary? 
remove some lint
 2017-09-06 09:01:53 -04:00
micael.bergeron c9aa793215 revert to using a simple representation 2017-09-06 09:01:53 -04:00
micael.bergeron bca72f5906 wip: fake its a binary diff 2017-09-06 09:01:53 -04:00
Brian Neel 9770c57fab Re-enable SqlInjection and CommandInjection 2017-08-08 10:50:54 -04:00
Ahmad Sherif ef2b81adb4 Migrate DiffCollection limiting logic to Gitaly 2017-07-19 18:05:22 +02:00
Jacob Vosmaer 0b0e89ef7b Try to eliminate unused diff options 2017-07-12 18:28:29 +02:00
Ahmad Sherif 5b092d21cc Encode Gitaly diff patches properly 2017-06-22 03:12:23 +02: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
Sean McGivern 9b42be02ab Only look up diff size limit flags once per request 2017-06-09 17:21:27 +01:00
Douwe Maan 07e7ce31e3 Merge branch '31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening' into 'master' 
Increase diff limits to 100 KB for collapse and 200 KB overall

Closes #31983

See merge request !11875
 2017-06-05 13:58:54 +00:00
Robert Speicher 993412f9de Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master' 
Use the new Gitaly CommitDiff RPC

See merge request !11826
 2017-06-02 19:39:02 +00:00
Sean McGivern 1d3c33b57e Increase diff limits to 100 KB for collapse and 200 KB overall 
This is controlled with the feature flag gitlab_git_diff_size_limit_increase.
Both of these limits were basically picked arbitrarily in the first place;
disabling the feature flag reverts to the old limits.
 2017-06-02 19:37:09 +01:00
Ahmad Sherif 4d1e987ec3 Use the new Gitaly CommitDiff RPC 2017-06-02 18:33:18 +02:00
Bob Van Landuyt e564fe971f Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper` 2017-06-01 21:21:14 +00:00
Douwe Maan 04cf618b6f Change no_limits to limits 2017-05-31 14:41:25 -05:00
Douwe Maan ce869e3964 Fix Diff#too_large? and specs 2017-05-30 21:48:30 -05:00
Douwe Maan d9461314ad Fix Diff#to_hash and #init_from_hash 2017-05-30 14:50:02 -05:00
Douwe Maan aed0387f97 Consistent diff and blob size limit names 2017-05-29 17:02:02 -05:00
Douwe Maan d9a0188d2f Add question mark to Gitlab::Diff::File predicate methods 2017-05-23 15:37:04 -05:00
Ahmad Sherif 99feed6e00 Add support for deltas_only under Gitaly 
Closes gitaly#199
 2017-05-13 18:27:06 +02:00
Ahmad Sherif c0a4f527db Use Gitaly for CommitController#show 2017-03-15 12:52:11 +02:00