Bob Van Landuyt
3a2aaed881
Use a Struct to keep track of failure info
2017-08-04 15:38:50 +02:00
Bob Van Landuyt
0dd4c306ca
Only track accessibility once
2017-08-04 15:38:50 +02:00
Bob Van Landuyt
022c38e63e
Use `keys` instead of `scan_each`
2017-08-04 15:38:49 +02:00
Bob Van Landuyt
3899d07f9e
Move hostname to Gitlab::Environment
2017-08-04 15:38:49 +02:00
Bob Van Landuyt
0fa94a0ddd
Make sure the check works for paths with spaces.
2017-08-04 15:38:49 +02:00
Bob Van Landuyt
3598e60bf2
Add a Circuitbreaker for storage paths
2017-08-04 15:38:48 +02: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
Lin Jen-Shin
b3e058996c
Cleanup tests and add admin_container_image to
...
full_authentication_abilities. This is fine because
we're going to check with can?(..) anyway
2017-08-02 17:51:29 +08: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
Z.J. van de Weg
3baf3dc955
Rename GitLabProjectImporterService and misc fixes
...
First round of review, main changes:
- templates.title is human readable, #name will be passed around
- GitLabProjectImporterService has been renamed
2017-08-01 14:36:42 +02:00
Filipa Lacerda
a853d3e944
[ci skip] Adds svgs and css for all icons
2017-08-01 13:25:52 +01: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
Jacob Vosmaer
5e20e448ce
Add Gitlab::Git::Blob.batch method
2017-08-01 13:49:57 +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
Z.J. van de Weg
09974de3e3
Create rake task to create project templates
...
First iteration, and some stuff is missing. But basically this rake task
does a clone of a project we've pointed it to. Than creates a project on
the GDK, which should be running in the background. This project is
exported, after which we move that archive to the location we need it.
We clean up by removing the generated project.
The first idea was to export the project on .com too, however than we
might run into ImportExport versions mismatch. This could've been
circumvented by checkout out an older commit locally. This however is
not needed yet, so we opted to not go this route yet, instead we will
iterate on what we got.
2017-08-01 13:00:51 +02: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
Grzegorz Bizon
8f1274ae03
Merge commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3' into backstage/gb/migrate-stages-statuses
...
* commit '9a3b283402b8cc1c86802c526f19a459ce09c2e3': (270 commits)
Add a note about EFS and GitLab log files
Projects logo are not centered vertically on projects page
Fix spec/features/projects/branches_spec
Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id
Fix a spec that was assuming to be on the wrong page
Add copy about search terms to ux guide
Update documentation of user creation by replacing the 'confirm' param with 'skip_confirmation'
Fix replying to commit comments on MRs from forks
Fix 500 error when rendering avatar for deleted project creator
Load and process at most 100 commits when pushing into default branch
Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
Add log messages to clarify log messages about API CSRF token verification failure
Update gitlab_flow.md, Teatro seems to be completely dead, see also https://forum.gitlab.com/t/gitlab-flow-documentation-teatro/7774
Fix diff commenting results just after changing view
Update CHANGELOG.md for 9.4.2
none is not a CSS Value for sizes ;-)
Merge issuable "reopened" state into "opened"
Make access level more compatible with EE
Add link to JIRA article in docs
Expand pipeline_trigger_service_spec by godfat request
...
2017-07-31 10:50:10 +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
Douwe Maan
0e355e5c92
Load and process at most 100 commits when pushing into default branch
2017-07-28 17:23:13 +02:00
Sean McGivern
bd2b68d73e
Merge branch 'dm-api-csrf-token-verification' into 'master'
...
Add log messages to clarify log messages about API CSRF token verification failure
Closes #35705
See merge request !13158
2017-07-28 14:39:36 +00:00
Douwe Maan
d020eabf29
Add log messages to clarify log messages about API CSRF token verification failure
2017-07-28 15:39:39 +02:00
Grzegorz Bizon
07bcabb305
Improve wording related to deploy chatops command
2017-07-28 12:16:07 +02:00
Z.J. van de Weg
1d3815f89b
Allow projects to be started from a template
...
Started implementation for the first iteration of
gitlab-org/gitlab-ce#32420 . This will allow users to select a template
to start with, instead of an empty repository in the project just
created.
Internally this is basically a small extension of the ImportExport
GitLab projects we already support. We just import a certain import
tar archive. This commits includes the first one: Ruby on Rails. In the
future more will be added.
2017-07-28 11:32:46 +02:00
Douwe Maan
da3100254f
Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'
...
Backport some recent changes related to LDAP from EE
See merge request !13119
2017-07-28 09:13:50 +00:00
Grzegorz Bizon
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
Alejandro Rodríguez
8e3f2ecfa9
Incorporate RefsService.FindAllBranches Gitaly RPC
2017-07-27 15:40:54 -04:00
Alejandro Rodríguez
432bb22308
Remove unused Gitlab::Git operations
2017-07-27 15:39:31 -04:00
Ahmad Sherif
cd5ae5cb2b
Migrate Repository#tags to Gitaly
...
Closes gitaly#411
2017-07-27 20:07:40 +02:00
Robert Speicher
066f4d8b71
Merge branch 'remove_custom_devise_failure_app' into 'master'
...
Remove GitLab custom failure app for Devise
See merge request !13136
2017-07-27 16:22:52 +00:00
Dmitriy Zaporozhets
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
Valery Sizov
3d83181b81
Remove GitLab custom fealure app for devise
2017-07-27 18:14:09 +03:00
Douwe Maan
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
Alexis Reigel
9488b7780e
optimize query, only select relevant db columns
2017-07-27 15:46:04 +02:00
Rubén Dávila
ef97cb54ae
Backport some recent changes related to LDAP from EE
2017-07-27 08:45:16 -05:00
Alexis Reigel
cd01e82873
store gpg user name and email on the signature
2017-07-27 15:44:39 +02:00
Pawel Chojnacki
9be1732296
add comment explaining use of shell commands and file operations in the same methods
2017-07-27 15:44:13 +02:00
Alexis Reigel
deb474b413
extract common method
2017-07-27 15:43:37 +02:00
Alexis Reigel
b66e3726dc
also update gpg_signatures when gpg_key is null
2017-07-27 15:43:37 +02:00
Alexis Reigel
7f03282f0f
remove duplicate statement
2017-07-27 15:43:37 +02:00
Alexis Reigel
a7d2ebe508
simplify fetching of commit
2017-07-27 15:43:37 +02:00
Alexis Reigel
4f7ba8f286
fix memoization
2017-07-27 15:43:37 +02:00
Alexis Reigel
ee7468e786
we need to update the gpg_key as well
2017-07-27 15:43:36 +02:00
Alexis Reigel
a01eabc19f
update rugged
...
the rugged versions up to 0.26.0b3 had a bug concerning the signature
extraction. The extracted signature was not always the same, probably
due to a buffer (overflow) issue in libgit.
see https://github.com/libgit2/rugged/issues/608
2017-07-27 15:43:36 +02:00
Alexis Reigel
028ecb081b
need to wrap the raw commit in a commit model
2017-07-27 15:42:53 +02:00
Alexis Reigel
d7f4264368
no need for passing parameter
...
we introduced memoizing, so it's safe to call the method multiple times.
2017-07-27 15:42:53 +02:00
Alexis Reigel
24671cd601
update invalid gpg signatures when key is created
2017-07-27 15:42:53 +02:00
Alexis Reigel
d48eb77a96
allow updating of gpg signature through gpg commit
2017-07-27 15:42:53 +02:00
Alexis Reigel
502e31bec9
memoize verified_signature call
2017-07-27 15:42:53 +02:00
Alexis Reigel
5d5fd4babe
store gpg_key_primary_keyid for unknown gpg keys
...
we need to store the keyid to be able to update the signature later in
case the missing key is added later.
2017-07-27 15:42:53 +02:00
Alexis Reigel
34810acd6c
move signature cache read to Gpg::Commit
...
as we write the cache in the gpg commit class already the read should
also happen there.
This also removes all logic from the main commit class, which just
proxies the call to the Gpg::Commit now.
2017-07-27 15:42:53 +02:00
Alexis Reigel
7b616d39ef
gpg signature is only valid when key is verified
2017-07-27 15:42:53 +02:00
Alexis Reigel
8c4b6a32fc
bail if the commit has no signature
2017-07-27 15:42:53 +02:00
Alexis Reigel
69e511c4c2
cache the gpg commit signature
...
we store the result of the gpg commit verification in the db because the
gpg verification is an expensive operation.
2017-07-27 15:42:53 +02:00
Alexis Reigel
2f956fae03
verify gpg commit using tmp keyring and db query
2017-07-27 15:42:53 +02:00
Alexis Reigel
3c42d73098
add primary keyid attribute to gpg keys
2017-07-27 15:42:53 +02:00
Alexis Reigel
7e13d96715
don't sync to keychain file
2017-07-27 15:42:53 +02:00
Alexis Reigel
8bd94a7304
remove gpg from keychain when user's email changes
2017-07-27 15:42:04 +02:00
Alexis Reigel
0668521b2b
move current keychain methods to namespace
2017-07-27 15:40:41 +02:00
Alexis Reigel
0e3d3d60ba
email handling for gpg keys
2017-07-27 15:40:41 +02:00
Alexis Reigel
87c0fd3455
add / remove gpg keys to / from system keychain
2017-07-27 15:40:41 +02:00
Alexis Reigel
e34cef0cd2
extract gpg functionality to lib class
2017-07-27 15:40:41 +02:00
Alexis Reigel
28bb5e3d53
commit signature with spec
2017-07-27 15:40:40 +02:00
Kevin O'Connor
817d9558fe
Prototype key verification
2017-07-27 15:40:40 +02:00
Sean McGivern
ef50875d3a
Merge branch '33601-add-csrf-token-verification-to-api' into 'master'
...
Resolve "Add CSRF token verification to API"
Closes #33601
See merge request !12154
2017-07-27 10:20:52 +00:00
Casper
a5d2ce8e61
Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-coded attributes.
2017-07-26 16:48:13 +00:00
Pawel Chojnacki
6ac0a142e0
Remove unnecessary begin/end
2017-07-26 17:16:59 +02:00
Grzegorz Bizon
79a7f7b6e5
Merge branch 'master' into backstage/gb/migrate-stages-statuses
...
* master: (110 commits)
Add missing colon
Fix project wiki web_url spec
Resolve "Memory usage notice doesn't link anywhere"
Docs new topic "user/index"
Implement GRPC call to RepositoryService
Pending delete projects should not show in deploy keys
Remove outdated ~Frontend label in CONTRIBUTING.md
Fixes 500 error caused by pending delete projects in admin dashboard
Add lower path index to redirect_routes
Remove project_key from the Jira configuration
Update CHANGELOG.md for 9.4.1
Enable gitaly_post_upload_pack by default
Add `api` prefix as a top level route in the spec.
Move relative_path to the element that is being clicked
Bumps Gitlab Omniauth LDAP version
Add directives to Vue component ordering
synchronize ukrainian translation in zanata again
v3 API is unsupported after 9.5, but may not be removed
Fix vertical alignment in firefox and safari for pipeline mini graph
Adds link_to_gfm method instrumentation
...
Conflicts:
db/schema.rb
2017-07-26 14:54:45 +02:00
Douwe Maan
d29598e691
Merge remote-tracking branch 'dev/master'
...
# Conflicts:
# Gemfile
# Gemfile.lock
2017-07-26 14:47:50 +02:00
Pawel Chojnacki
7ce0a61a99
use `.zero?` instead of `== 0`
2017-07-26 13:23:27 +02:00
Sean McGivern
96dba2ca17
Merge branch 'post-upload-pack-opt-out' into 'master'
...
Enable gitaly_post_upload_pack by default
See merge request !13078
2017-07-26 10:39:15 +00:00
Michael Kozono
7f92a36a36
Fix plain LDAP (no encryption)
2017-07-26 02:43:40 -07:00
Michael Kozono
0b4eb7f218
Fix code style
2017-07-26 02:43:37 -07:00
Michael Kozono
72d8b1e40a
Move backwards compatibility logic out of the code
...
And closer to the configuration setup. The code doesn’t need to know about this.
2017-07-26 02:43:36 -07:00
Michael Kozono
2d7d1fa69d
Pass configured `ssl_version` to `omniauth-ldap`
2017-07-26 02:43:36 -07:00
Michael Kozono
c8dd77de81
Pass configured `ca_file` to `omniauth-ldap`
2017-07-26 02:43:35 -07:00
Michael Kozono
cd13e4ae73
Verify certificates in `omniauth-ldap`
2017-07-26 02:43:35 -07:00
Michael Kozono
612b386450
Set `Net::LDAP` `ssl_version` option
2017-07-26 02:43:34 -07:00
Michael Kozono
dcc12505aa
Set `Net::LDAP` `ca_file` option
2017-07-26 02:43:34 -07:00
Michael Kozono
b67c007842
Set `Net::LDAP` encryption properly
2017-07-26 02:43:33 -07:00
Michael Kozono
94b4c9f34f
Use encryption instead of method
...
The method key is deprecated in the `gitlab_omniauth-ldap` gem.
2017-07-26 02:43:33 -07:00
Douwe Maan
dcf4a2e83c
Rescue only from ActionController::InvalidAuthenticityToken
2017-07-26 11:25:10 +02:00
blackst0ne
cc3a82bc8b
Add `rescue false`.
2017-07-26 11:05:44 +02:00
blackst0ne
8ce8b21f67
Refactor CSRF protection
2017-07-26 11:05:44 +02:00
Sean McGivern
695f5085a1
Merge branch 'zj-repo-exists-gitaly' into 'master'
...
Implement GRPC call to RepositoryService
See merge request !13019
2017-07-26 08:27:48 +00:00
Z.J. van de Weg
acf4a36b3e
Implement GRPC call to RepositoryService
2017-07-26 09:32:34 +02:00
Pawel Chojnacki
895e1b3ed1
Stop abusing subject to store results,
...
+ add helper methods to cleanup fs_shards metrics
2017-07-26 00:28:13 +02:00
Kamil Trzciński
ac948684fc
Merge branch '30634-protected-pipeline' into 'master'
...
Implement "Block pipelines on protected branches"
Closes #30634 , #34616 , and #33130
See merge request !11910
2017-07-25 15:04:23 +00:00
Jacob Vosmaer
a78306e7fa
Enable gitaly_post_upload_pack by default
2017-07-25 15:23:41 +02:00
Pawel Chojnacki
37f27079fe
Fix redis check with_timing method usage
2017-07-25 15:17:05 +02:00
Pawel Chojnacki
b1d6670d04
Add Changelog about temp file removal fix
...
+ remove whitespace
2017-07-25 14:34:39 +02:00
Pawel Chojnacki
2286879583
Ensure test files are deleted after tests
2017-07-25 14:19:09 +02:00
Bob Van Landuyt
bf114b3111
Add contents of `public` as forbidden top-level routes
2017-07-25 09:18:54 +02:00
Bob Van Landuyt
1dcf799c76
Remove a bunch of reserved top level routes
...
These don't seem to be used anywhere, so can be removed.
2017-07-25 09:18:54 +02:00
Robert Speicher
157e5d0c3a
Merge branch 'fix/use-another-gitaly-feature-name-for-workhorse-send-blob' into 'master'
...
Use a unique feature name for Workhorse send blob migration
See merge request !13031
2017-07-24 13:57:07 +00:00
Sean McGivern
e5b9bcff21
Merge branch '31533-usage-data-projects-stats' into 'master'
...
Add Slack and JIRA services counts to Usage Data
Closes #31533
See merge request !12974
2017-07-24 13:09:49 +00:00
Sean McGivern
6d13bc5863
Merge branch '33097-issue-tracker' into 'master'
...
Associate Issues tab only with internal issues tracker
Closes #33097
See merge request !12130
2017-07-24 13:00:33 +00:00
Jarka Kadlecova
124ef7dd60
Add Slack and JIRA services counts to Usage Data
2017-07-24 12:59:06 +02:00
Nick Thomas
61f948baed
Upgrade the re2 gem to 1.1.0
2017-07-24 11:03:37 +01:00
Grzegorz Bizon
0aefb51693
Merge branch 'master' into backstage/gb/migrate-stages-statuses
...
* master: (97 commits)
Bulk update sidebar UI polish
Fix margin in mini graph for commits box
Add space between words in language dropdown
Fix support for old CI API when image or services are not specified
Short-circuit build coverage extraction for empty regexes
Update VERSION to 9.5.0-pre
Update CHANGELOG.md for 9.4.0
Compress gitlab svg logo
Fix the gcovr coverage regex by removing line separators before scanning
Capitalize Sidekiq word in dev doc
Add 1px to breadcrumbs min height
Update nginx docs
Use custom font SVG for logo
Port spinach tests to rspec feature specs
Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'
Copy-edit background migrations guidelines
Add Traditional Chinese in Taiwan translations of Pipeline Schedules
Fix new project selectors in GitLab QA
Reword success to passing for pipeline badges
Rename build to pipeline for status badges
...
2017-07-24 11:01:34 +02:00
Filipa Lacerda
28f13d0456
Add space between words in language dropdown
2017-07-24 07:33:09 +00:00
Jarka Kadlecova
7bee7b848a
Support both internal and external issue trackers
2017-07-24 08:13:43 +02:00
Ahmad Sherif
1300736850
Use a unique feature name for Workhorse send blob migration
2017-07-24 07:07:20 +02:00
Nick Thomas
4bda5b502d
Short-circuit build coverage extraction for empty regexes
2017-07-22 07:12:19 +01:00
Grzegorz Bizon
d950e4d937
Merge branch 'zj-pipeline-badge-improvements' into 'master'
...
Pipeline badge improvements
Closes #15582 and #20961
See merge request !12966
2017-07-22 05:36:02 +00:00
Nick Thomas
000ddc96c5
Fix the gcovr coverage regex by removing line separators before scanning
...
RE2 differs from Ruby in handling multiple-line strings. The string "foo\n"
will not match the regular expression "foo$" unless multi-line mode is enabled
(and it's off by default).
Since we're already scanning the build trace line by line (and so multi-line
coverage regular expressions won't work), we can fix this by removing the line
separator before scanning the string.
2017-07-21 22:08:23 +01:00
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
Robert Speicher
1ce523c133
Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'
...
Migrate Gitlab::Git::Commit.find_all to Gitaly
Closes gitaly#396
See merge request !12934
2017-07-21 14:28:48 +00:00
Robert Speicher
d0da585233
Merge branch 'improve-ee-compat-check' into 'master'
...
Developer can just download the patch from the `ee_compat_check` job's artifact
See merge request !12967
2017-07-21 14:06:27 +00:00
Sean McGivern
8348141434
Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'
...
Fix an infinite loop in Gitlab:UntrustedRegexp
See merge request !2146
2017-07-21 13:13:07 +01:00
Z.J. van de Weg
8877f2e8c1
Reword success to passing for pipeline badges
2017-07-21 10:22:11 +02:00