Commit Graph

4440 Commits

Author SHA1 Message Date
Shinya Maeda d19f9a9675 Exclude schedule variables from Import/Export feature 2017-07-05 18:38:35 +09:00
Shinya Maeda 324cfe0f9b Fix spec. Add PipelineScheduleVariable for import_export 2017-07-05 18:38:35 +09:00
Shinya Maeda 395491d435 Exclude schedule variables from Import/Export feature 2017-07-05 18:36:19 +09:00
Shinya Maeda b6f41544d8 Fix spec. Add PipelineScheduleVariable for import_export 2017-07-05 18:36:19 +09:00
Douwe Maan 5af1fcd6f3 Merge branch '34544_add_italian_translation_of_i18n' into 'master'
Add Italian translation of Cycle Analytics Page & Project Page & Repository Page

Closes #34544

See merge request !12578
2017-07-04 19:16:25 +00:00
Paweł Chojnacki 26ac691a68 Instrument Unicorn with Ruby exporter 2017-07-04 15:28:34 +00:00
Sean McGivern 71a6c83a55 Merge branch 'gitaly-clean-up-tests' into 'master'
Clean up Gitaly tests

See merge request !12526
2017-07-04 14:14:22 +00:00
Jacob Vosmaer f39fe34afb Add test for GitalyClient::Ref#find_ref_name 2017-07-04 13:02:10 +02:00
Stan Hu d8cc0d0115 Speed up operations performed by gitlab-shell 2017-07-03 18:28:29 +00:00
Grzegorz Bizon 954e743b1d Merge branch 'change-extended-docker-configuration-syntax' into 'master'
Make entrypoint and command keys to be array of strings

See merge request !12536
2017-07-02 15:00:09 +00:00
Tomasz Maczukin dcdf2a8bc5 Make entrypoint and command keys to be array of strings 2017-07-02 14:48:11 +02:00
Jacob Schatz e48f54b5b2 Merge branch 'enable-webpack-code-splitting' into 'master'
Enable webpack code splitting

Closes #32989

See merge request !12032
2017-06-30 20:55:09 +00:00
黄涛 bd1c596264 add Italian translation to I18N
translated of Cycle Analytics Page
translated of Project Page
translated of Repository Page
add Changelog

Closes #34544
2017-06-30 10:02:34 +08:00
Alejandro Rodríguez f4e6aba1bb Set the GL_REPOSITORY env variable on Gitlab::Git::Hook 2017-06-29 15:22:40 -04:00
Sean McGivern 31c21d50fc Merge branch 'sha-attributes-for-postgresql-and-mysql' into 'master'
Added code for defining SHA attributes

See merge request !12555
2017-06-29 15:20:47 +00:00
Kamil Trzciński efb7b2d341 Merge branch 'zj-usage-ping-only-gl-pipelines' into 'master'
Only count GL pipelines in usage data ping

Closes #33172

See merge request !12277
2017-06-29 13:55:19 +00:00
Yorick Peterse af1f6844c9
Added code for defining SHA attributes
These attributes are stored in binary in the database, but exposed as
strings. This allows one to query/create data using plain SHA1 hashes as
Strings, while storing them more efficiently as binary.
2017-06-29 15:37:37 +02:00
Sean McGivern 8c5538be40 Merge branch 'refactor/declarative-policy' into 'master'
Refactor/declarative policy

See merge request !10515
2017-06-29 13:20:24 +00:00
Rémy Coutable 572fa2cb02 Merge branch '34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updated' into 'master'
Fix a bug where an invalid sort param value was passed to Gitaly

Closes #34280

See merge request !12534
2017-06-29 12:53:55 +00:00
Sean McGivern 971604de4c Merge branch 'bvl-rename-all-reserved-paths' into 'master'
Rename all forbidden paths again

Closes #32625

See merge request !11713
2017-06-29 11:50:22 +00:00
Mike Greiling 3137b886b8 configure webpack publicPath dynamically to account for CDN or relative path settings 2017-06-28 22:26:16 -05:00
Alejandro Rodríguez 5681bf6349 Fix a bug where an invalid sort param value was passed to Gitaly 2017-06-28 15:38:00 -04:00
Robert Speicher 9f44687a14 Merge branch 'gitaly-encodings' into 'master'
Fix gitaly ref encoding bugs

Closes #34156

See merge request !12522
2017-06-28 18:45:54 +00:00
Robert Speicher 9ef6d028a1 Merge branch 'dm-dependency-linker-newlines' into 'master'
Fix diff of requirements.txt file by not matching newlines as part of package names

Closes #34321

See merge request !12495
2017-06-28 15:24:01 +00:00
Douwe Maan 4970a66b24 Merge branch 'bvl-fix-ldap-login' into 'master'
Fix setting `last_credential_check_at` on LDAP-login

See merge request !12507
2017-06-28 14:59:43 +00:00
Jacob Vosmaer d3bcf8ac2a Fix gitaly ref encoding bugs 2017-06-28 16:15:59 +02:00
Sean McGivern 5dd6d9a9ec Merge branch 'submodules-private' into 'master'
Make Gitlab::Git::Repository#submodules private

See merge request !12479
2017-06-28 09:25:45 +00:00
Bob Van Landuyt d2eb5bbd9c Fix setting `last_credential_check` on LDAP-login 2017-06-28 09:30:18 +02:00
Douwe Maan 34f7c3bd1a Fix diff of requirements.txt file by not matching newlines as part of package names 2017-06-27 16:20:01 -05:00
http://jneen.net/ 37c401433b convert all the policies to DeclarativePolicy 2017-06-27 12:44:37 -07:00
http://jneen.net/ e5aad75a26 implement Presenter::Base#declarative_policy_delegate 2017-06-27 12:41:54 -07:00
Sean McGivern 6ab588665c Merge branch 'gitlab-git-find-commits' into 'master'
Clean up Gitlab::Git::Commit.find_all

See merge request !12476
2017-06-27 15:49:12 +00:00
Jacob Vosmaer cf131bf713 Make Gitlab::Ggit::Repository#submodules private 2017-06-27 16:03:35 +02:00
Bob Van Landuyt 7c53fcf11f Adjust for new static-analysis failures 2017-06-27 13:05:02 +02:00
Grzegorz Bizon c00e5bfa06 Merge branch 'zj-review-apps-usage-data' into 'master'
Add review apps to usage ping

Closes #33171

See merge request !12185
2017-06-27 10:53:12 +00:00
Z.J. van de Weg 4447006832 Split pipelines by origin on usage data
When sending the usage data, it now includes all pipelines. This commit
will split the pipelines in two; internal and external.

This will lead to historical data being incorrectly marked this way.

Fixes gitlab-org/gitlab-ce#33172
2017-06-27 12:47:44 +02:00
Rémy Coutable f4eef75d69 Merge branch '34324-gitlab-db-seed-is-broken' into 'master'
Resolve "GitLab DB seed is broken"

Closes #34324

See merge request !12464
2017-06-27 10:41:05 +00:00
Jacob Vosmaer 43c3a65062 Remove 'contains' option from Commit.find_all 2017-06-27 12:38:58 +02:00
Jacob Vosmaer 144e37c667 Remove Gitlab::Git::Repository#find_all 2017-06-27 12:30:51 +02:00
Bob Van Landuyt 397d3fd7d0 Only do one query for updating routes 2017-06-27 12:26:52 +02:00
Sean McGivern eacce60b17 Merge branch '34052-store-mr-ref-fetched-in-database' into 'master'
Store merge request ref_fetched status in the database

Closes #34052

See merge request !12424
2017-06-27 09:38:58 +00:00
Z.J. van de Weg e7d12a70d2 Add in_review_folder to usage ping
As its hard to reliably check how many review apps there are on the
clients machine, we start by checking where the type is `review`. This
means the folder is called that way. This will lead to a seq
scan on the table. However, this is done once a week, so the benefit of
adding an index seems not to apply here.
2017-06-27 09:39:05 +02:00
Robert Speicher b7ea3ce467 Merge branch '33600-fix-uncaught-throw-in-ee_compat_check' into 'master'
Fix an uncaught throw in the ee_compat_check job

Closes #33600

See merge request !12123
2017-06-26 20:28:22 +00:00
Sean McGivern 8a37b4c257 Merge branch 'remove-unused-argument' into 'master'
Remove unused Gitlab::Git::Commit#to_diff argument

See merge request !12466
2017-06-26 19:03:33 +00:00
Douwe Maan a353ba3753 Merge branch '34286_add_esperanto_translations_for_cycle_analytics_and_project_and_repository_pages' into 'master'
Add Esperanto translations for Cycle Analytics, Project, and Repository pages

Closes #34286

See merge request !12442
2017-06-26 18:31:05 +00:00
Jacob Vosmaer 2bad43f5ee Remove unused Gitlab::Git::Commit#to_diff argument 2017-06-26 18:50:26 +02:00
Sean McGivern d4a3474b9b Fix Gitlab::Database.bulk_insert for non-UTF-8 data 2017-06-26 17:21:40 +01:00
Bob Van Landuyt 60561aca22 Update routes directly by ID instead of filtering by path 2017-06-26 17:49:30 +02:00
Bob Van Landuyt 66ba0b0a34 Clear the cache for projects one-by-one 2017-06-26 17:49:30 +02:00
Bob Van Landuyt 8c850380a9 Add punctuation to log messages 2017-06-26 17:49:30 +02:00