9b21668663
Merge branch 'gitaly-renames-annotations' into 'master'
...
Gitaly deletions and annotations
See merge request !13280
2017-08-07 08:40:53 +00:00
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
03440eed20
Migrate blame loading to Gitaly
...
Closes gitaly#421
2017-08-03 19:20:46 +02:00
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
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
3a8f4a3460
Remove unnecessary 'raw' alias
2017-08-03 15:52:14 +02:00
29a07fd3a1
Rename 'commits_between' to 'rugged_commits_between'
2017-08-03 15:48:10 +02:00
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
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
72a7b30c9f
Change all `:empty_project` to `:project`
2017-08-02 17:47:31 -04:00
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
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
71951fc38c
Uniquify reserved word usernames on OAuth user creation
2017-08-02 09:40:49 -04:00
0bc1dfb6d5
Merge branch 'rs-empty_project-cleanup' into 'master'
...
Ensure all project factories use `:repository` trait or `:empty_project`
See merge request !13238
2017-08-02 09:45:42 +00:00
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
215e0911e5
Migrate Gitlab::Git::Repository#count_commits to Gitaly
...
Closes gitaly#415
2017-08-02 00:33:04 +02:00
9513bd18c4
Ensure all project factories use `:repository` trait or `:empty_project`
2017-08-01 14:51:52 -04:00
7a2509ea1f
Merge branch 'blob-limit-test' into 'master'
...
Fix bug in blob test
See merge request !13224
2017-08-01 12:53:57 +00:00
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
f3569a25e4
Fix bug in blob test
2017-08-01 13:53:32 +02:00
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
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
67de82cf5f
Add option to use CommitLanguages RPC
2017-08-01 10:48:46 +02:00
fb06a4d8fe
Rename more path_with_namespace -> full_path or disk_path
2017-08-01 07:28:13 +02:00
c6dee99803
Rename path_with_namespace -> disk_path when dealing with the filesystem
2017-08-01 07:26:58 +02:00
abb878326c
Rename many path_with_namespace -> full_path
2017-08-01 07:26:58 +02:00
cf2d2cd323
add tests for proper timezone date grouping within ContributionsCalendar
2017-07-31 17:36:46 -05:00
dbadf5a576
Merge branch 'mk-fix-wiki-backup' into 'master'
...
Fix improperly skipped backups of wikis
Closes #28854
See merge request !13096
2017-07-31 16:51:06 +00:00
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
7b18c42464
Remove unused (?) code
2017-07-31 17:19:25 +02:00
48778ac589
Tests for query context variables
2017-07-31 16:32:26 +02:00
6df5bd8b84
Context handling and tests cleanup + simple test kube_namespace context test
2017-07-31 16:32:26 +02:00
a459e45eac
Fix Rubocop offense
2017-07-28 14:44:23 -07:00
bab49fdf9f
Protect backups from stale cache for repo exists
2017-07-28 14:44:23 -07:00
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
07bcabb305
Improve wording related to deploy chatops command
2017-07-28 12:16:07 +02:00
56418e85ac
init
2017-07-28 18:13:29 +09:00
29a8827752
Improve deploy environment chatops slash command
...
We now match deployment actions better. If there is more than one
deployment action matched, we check if there is an action which name
equals to environment name, instead of raising an error about too many
actions defined.
2017-07-28 10:56:50 +02:00
8e3f2ecfa9
Incorporate RefsService.FindAllBranches Gitaly RPC
2017-07-27 15:40:54 -04:00
8065adcc1e
Improve Gitlab::Git::Repository specs for #branches
2017-07-27 15:39:31 -04:00
432bb22308
Remove unused Gitlab::Git operations
2017-07-27 15:39:31 -04:00
cd5ae5cb2b
Migrate Repository#tags to Gitaly
...
Closes gitaly#411
2017-07-27 20:07:40 +02:00
ac0cbe6970
Merge branch 'feature/gpg-signed-commits' into 'master'
...
GPG signed commits
Closes #20268
See merge request !9546
2017-07-27 15:29:39 +00:00
9981814514
Merge branch '34319-remove-useless-type-definitions-from-specs' into 'master'
...
Remove superfluous tags in RSpec examples.
Closes #34319
See merge request !12754
2017-07-27 15:01:06 +00:00
842bcfa777
Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into 'master'
...
Ensure test files are deleted after fs metrics gathering run
Closes #35457
See merge request !13080
2017-07-27 14:45:02 +00:00
9488b7780e
optimize query, only select relevant db columns
2017-07-27 15:46:04 +02:00
cd01e82873
store gpg user name and email on the signature
2017-07-27 15:44:39 +02:00
deb474b413
extract common method
2017-07-27 15:43:37 +02:00
b66e3726dc
also update gpg_signatures when gpg_key is null
2017-07-27 15:43:37 +02:00
a7d2ebe508
simplify fetching of commit
2017-07-27 15:43:37 +02:00
Sean McGivern
Tim Zallmann
Ahmad Sherif
Robert Speicher
Rémy Coutable
Jacob Vosmaer
Sean McGivern
Robert Speicher
Lin Jen-Shin
Robin Bobbitt
Douwe Maan
Gabriel Mazetto
Mike Greiling
Kamil Trzciński
Pawel Chojnacki
Michael Kozono
Alex Ives
Grzegorz Bizon
Shinya Maeda
Alejandro Rodríguez
Dmitriy Zaporozhets
Alexis Reigel