0013e6c00d
Clean up read_registry scope changes
...
Closes #37789
2017-09-18 08:39:01 -04:00
00e58f835a
Use parentheses in CI/CD kubernetes policy specs
2017-09-18 14:37:11 +02:00
f52c61f846
Do not initialize YAML processor with project full path
2017-09-18 14:35:31 +02:00
d79ad28fcb
Do not pass project path from YAML processor
...
Use project full path that can be received from a pipeline object
2017-09-18 14:29:43 +02:00
a04cbd5bb5
Add specs for CI/CD job policy refs specification
2017-09-18 13:57:14 +02:00
97caed20ed
Add specs for CI/CD job policy factory method
2017-09-18 13:57:14 +02:00
a7a7e2d8f7
Fix Rubocop offenses in YAML processor classes
2017-09-18 13:57:14 +02:00
10a486b366
Remove YAML processor refactoring stubs and fix specs
2017-09-18 13:57:14 +02:00
59f87e7317
Implement CI/CD kubernetes policy specification
2017-09-18 13:57:14 +02:00
2f594206e2
Merge branch 'operation-service-merge' into 'master'
...
Prepare Repository#merge for migration to Gitaly
Closes gitaly#559
See merge request gitlab-org/gitlab-ce!14154
2017-09-18 09:06:23 +00:00
36ad91d75a
Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master'
...
Clean up redirect routes that conflict with regular routes
Closes #36229
See merge request gitlab-org/gitlab-ce!13783
2017-09-18 08:24:52 +00:00
ac702af822
Fix setting share_with_group_lock
...
Prior to this commit running
Namespace#force_share_with_group_lock_on_descendants would result in
updating _all_ namespaces in the namespaces table, not just the
descendants. This is the result of ActiveRecord::Relation#update_all not
taking into account the CTE. To work around this we use the CTE query as
a sub-query instead of directly calling #update_all.
To prevent this from happening the relations returned by
Gitlab::GroupHierarchy are now marked as read-only, resulting in an
error being raised when methods such as #update_all are used.
Fortunately on GitLab.com our statement timeouts appear to have
prevented this query from actually doing any damage other than causing
a very large amount of dead tuples.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37916
2017-09-15 17:38:46 +02:00
902b5347dc
Prepare Repository#merge for migration to Gitaly
2017-09-15 16:39:20 +02:00
c923208721
Spread out the work a little
2017-09-14 14:17:23 -07:00
ee4f73916f
Extract helper for queuing background jobs
2017-09-14 14:17:23 -07:00
f1e963bd89
Add specs for deleting conflicting redirects
2017-09-14 14:17:23 -07:00
0cf694fbf3
Merge branch 'gitlab-git-user' into 'master'
...
Rename Gitlab::Git::Committer to User
See merge request gitlab-org/gitlab-ce!14254
2017-09-14 17:13:39 +00:00
9e40baba1e
Rename Gitlab::Git::Committer to User
2017-09-14 17:42:02 +02:00
cc66c3fda2
Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider
...
Some providers freeze their name (e.g.
414c43ef3f/lib/omniauth/strategies/google_oauth2.rb (L1)https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148 ).
In this case, we can just stop trying to force the encoding of the
provider name as they should always be in utf8 by default.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-09-14 10:29:35 +02:00
f06d370b20
Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'
...
Backport more EE changes to Gitlab::UrlSanitizer
See merge request !14150
2017-09-13 17:10:47 +00:00
e19827ab3b
Merge branch 'zj-usage-data-auto-devops' into 'master'
...
Add usage ping for Auto DevOps
Closes #37648
See merge request !14162
2017-09-13 08:48:20 +00:00
b097d065c5
Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'
...
Resolve "Move `lib/ci` to `lib/gitlab/ci`"
Closes #5836
See merge request !14078
2017-09-13 07:21:41 +00:00
e83a818751
adds changelog
...
fix CI
fix CI
2017-09-12 22:32:02 +03:00
5b296f81e2
move `lib/ci/mask_secret.rb` into `lib/gitlab/ci/mask_secret.rb`
2017-09-12 22:32:02 +03:00
c45ace8972
move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`
2017-09-12 22:32:02 +03:00
f364cc34ea
move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`
2017-09-12 22:32:01 +03:00
060fc3905d
move `lib/ci/ansi2html.rb` into `lib/gitlab/ci/ansi2html.rb`
2017-09-12 22:32:01 +03:00
e21c12375a
Merge branch 'revert-2f46c3a8' into 'master'
...
Revert "Merge branch 'revert-f2421b2b' into 'master'"
See merge request !14190
2017-09-12 18:31:54 +00:00
a1a2ce4af4
Merge branch 'gitaly-519-commit-stats' into 'master'
...
Migrate Git::CommitStats to Gitaly
Closes gitaly#519
See merge request !14077
2017-09-12 16:48:30 +00:00
a31e0aff22
Resolve "Error 500 in non-UTF8 branch names"
2017-09-12 14:07:31 +00:00
74bf291c78
Add auto devops enabled/disabled to usage ping
2017-09-12 12:33:48 +02:00
2602cc0c36
Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master'
...
Hide read_registry scope when registry is disabled on instance
See merge request !13314
2017-09-12 09:57:48 +00:00
b46d5b13ec
Backport more EE changes to Gitlab::UrlSanitizer
2017-09-11 21:43:43 +01:00
25c34608b9
Migrate Git::CommitStats to Gitaly
2017-09-11 21:00:58 +02:00
9b177bb7c9
Revert "Merge branch 'revert-f2421b2b' into 'master'"
...
This reverts merge request !14148
2017-09-11 15:44:42 +00:00
5c6f40ab6e
Add usage ping for Auto DevOps
...
Fixes gitlab-org/gitlab-ce#37648
2017-09-08 19:38:02 +02:00
52a2423e37
Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"
...
This reverts merge request !13619
2017-09-08 14:48:44 +00:00
bc10afb600
Merge branch 'dm-go-get-xss' into 'security-9-3'
...
Fix XSS issue in go-get handling
See merge request !2128
2017-09-07 20:22:16 -04:00
40b0b1a391
Merge branch '35558-only-one-garbage-collection-should-be-running-per-project-at-once' into 'master'
...
Adds exclusive lease to Git garbage collect worker.
Closes #35558
See merge request !14036
2017-09-07 19:34:59 +00:00
39298575a8
Adds exclusive lease to Git garbage collect worker.
2017-09-07 18:52:04 +01:00
94680e1448
Gitaly feature toggles are on by default in development environments
2017-09-07 17:39:00 +00:00
12ddc28f84
Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops-table
2017-09-07 18:03:20 +02:00
f2421b2b97
Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'
...
Add option to change navigation color palette
Closes #35012
See merge request !13619
2017-09-07 15:56:00 +00:00
4ae8e20c9c
Merge branch 'events-migration-cleanup' into 'master'
...
Finish migration to the new events setup
Closes #37241
See merge request !13932
2017-09-07 15:33:54 +00:00
62a5cc7134
Merge branch 'master' into zj-auto-devops-table
2017-09-07 15:20:04 +02:00
c2e99b40f7
Implement fix for n+1 issue on `flatten_tree` helper
2017-09-06 17:47:25 -03:00
cd8ea329f0
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into zj/gitlab-ce-zj-auto-devops-table
2017-09-06 21:00:47 +02:00
6ee158197d
Add previews in preferences
2017-09-06 11:37:40 -07:00
1245cccf68
Use `table` helper in migration specs
2017-09-06 12:57:30 -05:00
cd84ce1a1b
Don't depend on user model in migration spec
...
The User model now has a default value for a field that didn't exist when these
migrations ran.
2017-09-06 12:56:22 -05:00
c3ac731152
Add blue theme
2017-09-06 12:54:09 -05:00
3c815f97d3
Add functionality for two themes
2017-09-06 12:54:09 -05:00
6c49a62800
Restore some changes from !9199
2017-09-06 12:54:09 -05:00
86cbf60cbb
Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'
...
Migrate creating/deleting a branch to Gitaly
See merge request !13864
2017-09-06 17:26:05 +00:00
04f8874209
Merge branch 'url-sanitizer-fixes' into 'master'
...
Fix problems sanitizing URLs with empty passwords
Closes gitlab-ee#3352
See merge request !14083
2017-09-06 16:15:02 +00:00
29a34b3c28
Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'
...
Add API endpoint for downloading a single job artifact
Closes #37196
See merge request !14027
2017-09-06 15:58:26 +00:00
ba39b26cc2
Merge branch '35942_api_binary_encoding' into 'master'
...
API fix for non UTF-8 data
Closes #35942
See merge request !14038
2017-09-06 15:55:35 +00:00
41ef94e777
Migrate creating/deleting a branch to Gitaly
2017-09-06 17:25:17 +02:00
235b105c91
Finish migration to the new events setup
...
This finishes the procedure for migrating events from the old format
into the new format. Code no longer uses the old setup and the database
tables used during the migration process are swapped, with the old table
being dropped.
While the database migration can be reversed this will 1) take a lot of
time as data has to be coped around 2) won't restore data in the
"events.data" column as we have no way of restoring this.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241
2017-09-06 16:40:31 +02:00
c8bdb20228
Remove blank passwords from sanitized URLs
2017-09-06 15:29:14 +01:00
759f34bd0a
Backport EE fixes to Gitlab::UrlSanitizer to CE
2017-09-06 15:29:13 +01:00
46f6092a6d
[ci-skip] spec for an instance method
2017-09-06 09:44:12 -04:00
4df54f2607
Profile updates from providers
2017-09-06 16:38:52 +03:00
8189347b49
Merge branch 'master' into zj-auto-devops-table
2017-09-06 15:16:38 +02:00
5625b0e453
add .json_safe_diff spec
2017-09-06 09:01:53 -04:00
3b9f9aa00b
Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into feature/gb/download-single-job-artifact-using-api
...
* commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
2017-09-06 14:29:17 +02:00
9985296521
Merge branch 'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master'
...
Add setting to collapse outdated diff comments on push
Closes #36994
See merge request !14053
2017-09-06 11:57:16 +00:00
c1af169f1a
Merge branch 'fix/import-export-performance' into 'master'
...
Improve Import/Export memory use and performance
Closes #35389 and #26556
See merge request !13957
2017-09-06 11:55:28 +00:00
b40941db14
Fix note resolution specs
2017-09-06 10:10:16 +01:00
ef4b3a39bc
Add functionality to collapse outdated diff comments regardless of discussion resolution
2017-09-06 10:07:46 +01:00
66cfb901c0
Optimize SQL queries used in Groups::GroupMembersController#create
...
The following optimizations were performed:
- Add new association to GroupMember and ProjectMember
This new association will allow us to check if a user is a member of a
Project or Group through a single query instead of two.
- Optimize retrieving of Members when adding multiple Users
2017-09-05 15:54:07 -05:00
104f221b60
fix specs
2017-09-05 21:06:27 +02:00
e10437de40
Migrate Gitlab::Git::Repository#find_branch to Gitaly
2017-09-05 17:29:45 +00:00
9bb056e0f1
Merge branch 'fuzzy-issue-search' into 'master'
...
Fuzzy search issues / merge requests
Closes #26835 , #29994 , and #20362
See merge request !13780
2017-09-05 15:48:39 +00:00
1d57ae8f84
fix typo
2017-09-05 17:47:45 +02:00
d8d05e5f28
refactor code a little
2017-09-05 17:47:45 +02:00
4119206f76
fix export performance of CI builds
2017-09-05 17:47:45 +02:00
8813089a64
Merge branch 'mr-index-page-performance' into 'master'
...
Re-use issue/MR counts for the pagination system
Closes #27168
See merge request !13805
2017-09-05 14:51:19 +00:00
8bafe5d1ee
Fix typo
2017-09-05 22:23:02 +09:00
978252a3fa
use new #verification_status
2017-09-05 12:18:33 +02:00
00392d929b
add verification_status: same_user_different_email
...
this is used to make a difference between a committer email that belongs
to user, where the user used a different email for the gpg key. this
means that the user is the same, but a different, unverified email is
used for the signature.
2017-09-05 12:18:32 +02:00
2a89037b63
downcase gpg key's emails
...
this is necessary for email comparisons
2017-09-05 12:18:31 +02:00
c5e0bd56fb
extract shared example
2017-09-05 12:18:31 +02:00
64855c8e30
match the committer's email against the gpg key
...
the updated verification of a gpg signature requires the committer's
email to also match the user's and the key's emails.
2017-09-05 12:18:31 +02:00
508ff17b34
pass whole commit to Gitlab::Gpg::Commit again
...
we need the commit object for the updated verification that also checks
the committer's email to match the gpg key and user's emails.
2017-09-05 12:18:31 +02:00
c53f319f88
Extract a class that represents artifacts file path
2017-09-05 12:17:56 +02:00
42062a454a
Re-use issue/MR counts for the pagination system
...
This changes the issue and MR index pages so the pagination system
re-uses the output of the COUNT(*) query used to calculate the number of
rows per state (opened, closed, etc). This removes the need for an
additional COUNT(*) on both pages.
2017-09-05 11:53:45 +02:00
68f6c61cf6
- Allow runner API to pass failure_reason
...
- Fix spec
2017-09-05 14:30:28 +09:00
bcd70c4c46
Incorporate review
2017-09-04 15:44:46 +02:00
a0c13698f9
Merge branch 'feature/gb/kubernetes-only-pipeline-jobs' into 'master'
...
Check if Kubernetes is required when creating pipeline jobs
Closes #34785
See merge request !13849
2017-09-04 12:30:27 +00:00
a6f9470b4a
Merge branch 'bvl-only-require-po-parser-in-rake' into 'master'
...
Only require `simple_po_parser` in rake task that needs it
Closes #37379
See merge request !14018
2017-09-04 10:21:48 +00:00
e23e86953d
Merge branch 'master' into feature/gb/kubernetes-only-pipeline-jobs
...
* master: (469 commits)
2017-09-04 12:13:11 +02:00
d449355f94
Merge branch 'feature/sm/33281-protected-runner-executes-jobs-on-protected-branch' into 'master'
...
Protected runner executes jobs on protected branch [Solution 1]
Closes #33281
See merge request !13194
2017-09-04 08:23:50 +00:00
a343484bdf
Merge branch 'zj-sort-templates' into 'master'
...
Sort templates when fetching them
Closes #37153
See merge request !13920
2017-09-04 08:18:41 +00:00
a315e6025c
Merge branch 'master' into zj-auto-devops-table
2017-09-04 09:28:46 +02:00
78dad4cf32
Fix tests
2017-09-04 09:27:09 +02:00
7199e882db
Only require `simple_po_parser` in rake task that needs it
...
That way we don't need to install it in production, since it's really
not needed there.
2017-09-04 08:30:10 +02:00
b623807682
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2017-09-03 16:09:59 -05:00
eab938d505
Fix typo
2017-09-03 23:49:11 +09:00
f3d3cecf5a
Fix schema. Add safe_model_attributes for pipelines
2017-09-03 23:49:10 +09:00
Robin Bobbitt
Grzegorz Bizon
Rémy Coutable
Douwe Maan
Yorick Peterse
Jacob Vosmaer
Michael Kozono
Kamil Trzciński
Grzegorz Bizon
Maxim Rydkin
Robert Speicher
Micael Bergeron
Zeger-Jan van de Weg
Nick Thomas
Kim "BKC" Carlbäcker
Annabel Dunstone Gray
Rubén Dávila
Tiago Botelho
Andrew Newdigate
Sean McGivern
Alejandro Rodríguez
Sean McGivern
Ahmad Sherif
micael.bergeron
Alexander Keramidas
Ashley Dumaine
James Lopez
Ahmad Sherif
Hiroyuki Sato
Alexis Reigel
Shinya Maeda
Bob Van Landuyt
Jose Ivan Vargas