Commit Graph

4755 Commits

Author SHA1 Message Date
Huang Tao 0732b974fa Add Korean translation to i18n 2017-08-07 09:19:41 +00:00
Sean McGivern 9b21668663 Merge branch 'gitaly-renames-annotations' into 'master'
Gitaly deletions and annotations

See merge request !13280
2017-08-07 08:40:53 +00:00
Tim Zallmann 9b93508028 Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'
Fix Timezone Inconsistencies in User Contribution Calendar

Closes #27616 and #1943

See merge request !13208
2017-08-06 05:57:49 +00:00
Robert Speicher e299d595c7 Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'
Migrate Repository#last_commit_for_path to Gitaly

Closes gitaly#433

See merge request !13200
2017-08-04 15:46:36 +00:00
Ahmad Sherif f81c07eacc Migrate Repository#last_commit_for_path to Gitaly
Closes gitaly#433
2017-08-03 19:26:46 +02:00
Ahmad Sherif 03440eed20 Migrate blame loading to Gitaly
Closes gitaly#421
2017-08-03 19:20:46 +02:00
Robert Speicher 8f9b658e3a Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'
Migrate Gitlab::Git::Repository#count_commits to Gitaly

Closes gitaly#415

See merge request !13121
2017-08-03 15:25:03 +00:00
Jacob Vosmaer 25a6a0725c Migration link for Repository#log 2017-08-03 16:48:11 +02:00
Rémy Coutable 2a73be5161 Merge branch 'merge-request-commits-background-migration' into 'master'
Merge request commits background migration

See merge request !12685
2017-08-03 14:41:58 +00:00
Jacob Vosmaer 00c9c6b458 Remove unused methods 2017-08-03 16:03:37 +02:00
Jacob Vosmaer 3a8f4a3460 Remove unnecessary 'raw' alias 2017-08-03 15:52:14 +02:00
Jacob Vosmaer 29a07fd3a1 Rename 'commits_between' to 'rugged_commits_between' 2017-08-03 15:48:10 +02:00
Sean McGivern 27d34789c9 Merge branch '28472-ignore-auto-generated-mails' into 'master'
Don't send rejection mails for all auto-generated mails

Closes #28472

See merge request !13254
2017-08-03 12:41:16 +00:00
Sean McGivern f2d50af917 Migrate MR commits and diffs to new tables
Previously, we stored these as serialised fields - `st_{commits,diffs}` - on the
`merge_request_diffs` table. These now have their own tables -
`merge_request_diff_{commits,diffs}` - with a column for each attribute of the
serialised data.

Add a background migration to go through the existing MR diffs and migrate them
to the new format. Ignore any contents that cannot be displayed. Assuming that
we have 5 million rows to migrate, and each batch of 2,500 rows can be
completed in 5 minutes, this will take about 7 days to migrate everything.
2017-08-03 13:20:26 +01:00
Lin Jen-Shin 86e1f41b83 Check against "Auto-Submitted: no" instead
This would be much more accurate. We assume this is an
auto-generated email if such header is provided, and
the value is not "no". It could also be: "auto-generated",
"auto-replied", or other values from extension. It seems
that only "no" could mean that this is sent by a human.

See: https://tools.ietf.org/html/rfc3834
2017-08-03 19:29:18 +08:00
Lin Jen-Shin f097e4dbcd Don't send rejection mails for all auto-generated mails
Also make it easier to have mailer helper
2017-08-03 00:40:10 +08:00
Rémy Coutable 42aa9311be Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master'
Uniquify reserved word usernames on OAuth user creation

See merge request !13244
2017-08-02 14:46:32 +00:00
Robin Bobbitt 71951fc38c Uniquify reserved word usernames on OAuth user creation 2017-08-02 09:40:49 -04:00
Sean McGivern 30413fd2ff Merge branch 'rugged-is-ancestor' into 'master'
Add rugged_is_ancestor method

See merge request !13232
2017-08-02 09:57:06 +00:00
Douwe Maan c327affc61 Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into 'master'
Add kube_namespace and standardize common variables for additional metrics queries

See merge request !13169
2017-08-02 09:09:53 +00:00
Ahmad Sherif 215e0911e5 Migrate Gitlab::Git::Repository#count_commits to Gitaly
Closes gitaly#415
2017-08-02 00:33:04 +02:00
Pawel Chojnacki ba97a42193 Remove default arguments for common query context 2017-08-01 22:11:59 +02:00
Pawel Chojnacki feb94e8ea3 Move timeframe_start and timeframe_end to common query context 2017-08-01 21:51:53 +02:00
Pawel Chojnacki b243c3ea78 Give metric query context rspec examples correctly sounding names. + missing whitespace 2017-08-01 20:28:25 +02:00
Jacob Vosmaer d3ddc69b54 Add rugged_is_ancestor method 2017-08-01 17:24:37 +02:00
Sean McGivern c7583e72f9 Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into 'master'
Always fetch branches before finding the merge base, otherwise we could find an outdated merge base

See merge request !13226
2017-08-01 13:00:05 +00:00
Sean McGivern 90cb2aab38 Merge branch '28283-legacy-storage-format' into 'master'
[CE] Added Legacy Storage format

See merge request !13149
2017-08-01 12:24:24 +00:00
Rémy Coutable 4fa83bbe90
Always fetch branches before finding the merge base, otherwise we could find an outdated merge base
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-01 13:52:44 +02:00
Sean McGivern 5343b3ef57 Merge branch 'gitaly-commit-languages' into 'master'
Add option to use Gitaly CommitLanguages RPC

See merge request !13084
2017-08-01 11:22:53 +00:00
Douwe Maan c8a8d13dbb Merge branch 'remove-content-commit' into 'master'
Remove unused Gitlab::Diff code

See merge request !13195
2017-08-01 10:40:36 +00:00
Jacob Vosmaer 67de82cf5f Add option to use CommitLanguages RPC 2017-08-01 10:48:46 +02:00
Gabriel Mazetto 07b574b41c Added some extra TODOs for the Legacy Storage refactor 2017-08-01 07:28:13 +02:00
Gabriel Mazetto fb06a4d8fe Rename more path_with_namespace -> full_path or disk_path 2017-08-01 07:28:13 +02:00
Gabriel Mazetto c6dee99803 Rename path_with_namespace -> disk_path when dealing with the filesystem 2017-08-01 07:26:58 +02:00
Gabriel Mazetto abb878326c Rename many path_with_namespace -> full_path 2017-08-01 07:26:58 +02:00
Mike Greiling 08c513b6d9 fix rubocop violations 👮 2017-07-31 18:19:18 -05:00
Mike Greiling 1b9b6974fd fix mysql syntax for date INTERVAL arithmatic 2017-07-31 17:36:47 -05:00
Kamil Trzciński 0b0d04b4db Merge branch 'fix/gb/fix-chatops-deploy-multiple-actions-matching' into 'master'
Improve deploy environment chatops slash command

Closes #34748

See merge request !13150
2017-07-31 15:28:07 +00:00
Jacob Vosmaer 7b18c42464 Remove unused (?) code 2017-07-31 17:19:25 +02:00
Pawel Chojnacki 6df5bd8b84 Context handling and tests cleanup + simple test kube_namespace context test 2017-07-31 16:32:26 +02:00
Pawel Chojnacki ce83e5635d add kube_namespace and standardize common variables for additional metrics queries 2017-07-31 16:32:26 +02:00
Rémy Coutable 0d52e59de4 Merge branch '29385/add_shrug_command' into 'master'
Fixes #29385: Add /shrug and /tableflip commands

Closes #29385

See merge request !10068
2017-07-31 14:02:00 +00:00
Sean McGivern a628d39599 Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'
Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor

Closes #35752

See merge request !13185
2017-07-31 10:56:23 +00:00
Douwe Maan ebd2ed8f64 Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor 2017-07-31 11:43:35 +02:00
Sean McGivern 15d00fc3d3 Merge branch 'gitaly-398-git-garbage-collect' into 'master'
Migrate GitGarbageCollectWorker to Gitaly

Closes gitaly#398

See merge request !12975
2017-07-31 07:57:23 +00:00
Mike Greiling d1f5e81e8b adjust timezone for date grouping in contributions calendar 2017-07-29 01:50:17 -05:00
Mike Greiling be77d76e73 use timezone-aware Date.current instead of Date.today in ContributionsCalendar class 2017-07-29 00:36:54 -05:00
Alex Ives a07fe9d7f8 Fixes #29385: Add /shrug and /tableflip commands
- Updated DSL to support substitution definitions
- Added substitution definition, inherits from command definition
- Added tabelflip and shrug substitutions to interpret service
- Added support for substitution definitions to the extractor for preview mode.
- Added substitution handling in the interpret service

Signed-off-by: Alex Ives <alex@ives.mn>
2017-07-28 14:37:44 -05:00
Robert Speicher 0bb58ff885 Merge branch 'dm-large-push-performance' into 'master'
Load and process at most 100 commits when pushing into default branch

Closes #35531

See merge request !13132
2017-07-28 17:03:17 +00:00
Kim "BKC" Carlbäcker 05f90b861f Migrate GitGarbageCollectWorker to Gitaly 2017-07-28 17:49:22 +02:00