Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-19Merge branch 'moved-submodules' into 'master'Rémy Coutable
repository: index submodules by path See merge request !10798
2017-06-16repository: index submodules by pathDavid Turner
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-16Add table for files in merge request diffsSean McGivern
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-14Correct RSpec/SingleLineHook cop offensesRobert Speicher
2017-06-08Move diffable? method from Repository to Diff::FileDouwe Maan
2017-06-06Fix Diff::Position#diff_file for positions on straight diffsDouwe Maan
2017-06-05Merge branch ↵Douwe Maan
'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-02Merge branch 'fix/use-new-gitaly-commit-diff-rpc' into 'master'Robert Speicher
Use the new Gitaly CommitDiff RPC See merge request !11826
2017-06-02Increase diff limits to 100 KB for collapse and 200 KB overallSean McGivern
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-02Use the new Gitaly CommitDiff RPCAhmad Sherif
2017-06-02Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt
2017-06-01Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern
Consistent diff and blob size limit names See merge request !11776
2017-05-31Change no_limits to limitsDouwe Maan
2017-05-31Fix Diff#too_large? and specsDouwe Maan
2017-05-31Make .gitmodules parsing more resilient to syntax errorsDouwe Maan
2017-05-30Avoid crash when trying to parse string with invalid UTF-8 sequenceBob Van Landuyt
2017-05-30Consistent diff and blob size limit namesDouwe Maan
2017-05-23Add test that shows DiffCollection restart bugJacob Vosmaer
2017-05-18Merge branch 'gitaly-local-branches' into 'master'Douwe Maan
Incorporate Gitaly's local_branches operation into repo code Closes #27379 See merge request !10059
2017-05-18Incorporate Gitaly's local_branches operation into repo codeAlejandro Rodríguez
2017-05-16Re-enable gitaly migration for ref_name_for_sha after bugfixesAlejandro Rodríguez
2017-05-10Enable the Style/TrailingCommaInArguments copRémy Coutable
Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-10Enable the Style/TrailingCommaInLiteral copRémy Coutable
Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-04Sort the network graph both by commit date and topographically.Timothy Andrew
- 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-03Merge branch 'fix-gitaly-not-found' into 'master' Douwe Maan
Re-enable ref operations with gitaly after not-found fix See merge request !10773
2017-05-03Merge branch 'rs-described_class-cop-2' into 'master' Douwe Maan
Enable `RSpec/DescribedClass` cop and correct violations See merge request !10930
2017-05-02Re-enable ref operations with gitaly after not-found fixAlejandro Rodríguez
2017-05-01Auto-correct `RSpec/DescribedClass` violationsRobert Speicher
2017-04-28Fix RSpecKim "BKC" Carlbäcker
2017-04-27Fix ordering of commits in the network graph.Timothy Andrew
- 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-20Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING ↵James Lopez
error
2017-04-20Refactor changing files in web UIDouwe Maan
2017-04-18Fix specsDouwe Maan
2017-04-12Merge branch 'gitaly-testing' into 'master' Rémy Coutable
Setup and run a Gitaly server for testing if GitalyClient is enabled See merge request !10298
2017-04-11Setup and run a Gitaly server for testing if GitalyClient is enabledAlejandro Rodríguez
2017-04-10Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-10Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-10Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-04Incorporate Gitaly client for refs serviceAlejandro Rodríguez
2017-04-02Fix symlink icon in project treemhasbini
2017-03-30Support >1 path in Gitlab::Git::Repository#logSean McGivern
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-25Fix RSpec/DescribeSymbol cop violationsRobert Speicher
2017-03-17Merge branch 'feature/use-gitaly-for-commit-show' into 'master'Robert Speicher
Use Gitaly for CommitController#show See merge request !9629
2017-03-16Fix archive prefix bug for refs containing dotsMark Fletcher
2017-03-15Use Gitaly for CommitController#showAhmad Sherif
2017-03-14Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different ↵Rémy Coutable
gitlab-git-test repo We will set this to the dev mirror in GitLab CE and EE on dev. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-08Returns correct header data for commits endpointOswaldo Ferreira
2017-03-08Fix pagination headers for repository commits api endpointGeorge Andrinopoulos
2017-03-02Ensure archive download is only one directory deepMark Fletcher
2017-02-25Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher
Make Git history follow renames again by performing the --skip in Ruby Closes #23062 See merge request !9314