Nick Thomas
25bd49e4f5
Backport project template API to CE
2018-10-05 11:34:43 +01:00
gfyoung
3836d69119
Enable frozen string in lib/api and lib/backup
...
Partially addresses #47424 .
Had to make changes to spec files because
stubbing methods on frozen objects is a mess
in RSpec and leads to failures:
https://github.com/rspec/rspec-mocks/issues/1190
2018-09-29 21:04:50 -07:00
Alexis Reigel
585b1b3fca
add user's public_email attribute to api
2018-09-27 11:33:55 +02:00
Yorick Peterse
2039c8280d
Disable existing offenses for the CodeReuse cops
...
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
2018-09-11 17:32:00 +02:00
Jan Provaznik
d95c1f0335
Use ResourceLabelEvent for tracking label changes
2018-09-07 13:39:20 +00:00
Dmitriy Zaporozhets
464b0de1ac
Merge branch 'filter-web-hooks-by-branch' into 'master'
...
Filter web hooks by branch
See merge request gitlab-org/gitlab-ce!19513
2018-09-05 13:39:41 +00:00
🙈 jacopo beschi 🙉
20bd1e6b34
Resolve "Return how many commits the source branch is behind the target branch through the API"
2018-09-05 13:07:02 +00:00
Francisco Javier López
f9475e299c
Uploads to wiki stored inside the wiki git repository
2018-09-04 10:39:08 +00:00
Robert Speicher
21b7e203b3
Merge branch 'feature/#32877-add-default-field-branch-api' into 'master'
...
Add default parameter to branches API
Closes #32877
See merge request gitlab-org/gitlab-ce!21294
2018-09-01 00:39:43 +00:00
Robert Schilling
08cc6afc6e
API: Protected tags
2018-08-25 05:38:54 +00:00
Sean McGivern
e922750e89
Merge branch 'api-shared_group_expires-at' into 'master'
...
API: Add shared project's expiration date
Closes #46107
See merge request gitlab-org/gitlab-ce!21104
2018-08-22 08:26:29 +00:00
Robert Schilling
7308a9be1e
API: Add shared project's expiration date
2018-08-21 11:23:05 +02:00
Riccardo Padovani
25efc5f288
Add default parameter to branches API
2018-08-18 13:03:42 +02:00
Nick Thomas
f6f6295027
Convert the license template API to use the new LicenseTemplateFinder
2018-08-15 07:38:18 +01:00
Kamil Trzciński
6343964b9c
Merge branch 'expose-all-artifacts-sizes-in-jobs-api' into 'master'
...
Expose all artifacts sizes in jobs api
See merge request gitlab-org/gitlab-ce!20821
2018-08-14 19:53:58 +00:00
Peter Marko
3a80f03037
Expose all artifacts sizes in jobs api
2018-08-14 15:55:02 +02:00
Mark Chao
8411d1cffc
Add email_events to replace EMAIL_EVENTS because it needs to be dynamic,
...
allowing override for EE.
2018-08-14 14:59:29 +08:00
Duana Saskia
ece6a1ea6e
Filter project hooks by branch
...
Allow specificying a branch filter for a project hook and only trigger
a project hook if either the branch filter is blank or the branch matches.
Only supported for push_events for now.
2018-08-13 13:20:58 +02:00
Jarka Kadlecová
15179878d5
Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""
...
This reverts commit 8717c7dad9 .
2018-08-02 10:42:45 +02:00
Rémy Coutable
83a0db0c55
Merge branch 'bvl-user-status-message-35463' into 'master'
...
Allow users to set a status
Closes #35463
See merge request gitlab-org/gitlab-ce!20614
2018-08-01 15:21:24 +00:00
Bob Van Landuyt
12095251c3
Add the message HTML to the UserStatus api
2018-08-01 12:42:04 +02:00
Bob Van Landuyt
b4c4b48a8c
Allow users to set a status
...
This can be done trough the API for the current user, or on the
profile page.
2018-07-30 15:01:26 +02:00
Shinya Maeda
3703cc4bbb
Squashed commit of the following:
...
commit c35ca6594eb1d29cac46362d09036f3d128143ed
Merge: 87da74fb98a 13ea4b387d
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 27 13:25:22 2018 +0900
Merge branch 'master-ce' into artifact-format-v2
commit 87da74fb98aef1f664553ca2b8406ca154e4c19f
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 26 20:27:45 2018 +0900
Remove unncessary GENERAL_ARCHIVE_FILE_TYPE
commit 5a3cfc1fdc8e81dd5647e275f87c0da2d93235b4
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 26 20:19:44 2018 +0900
Expand entities in JobRequest::Artifacts
commit 660f885ebb25a19182e601181050683d2b6134f6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 26 20:06:14 2018 +0900
Add tests
commit 60bca3dcfd055647a9f43523b79d5eebdc4bdc5a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 26 19:30:52 2018 +0900
Simplify build runner presenter
commit 81d1951d5562bec4086d719748360f3f24df4168
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 26 19:18:53 2018 +0900
Simplify `scope :test_reports` in job_artifacts
commit 15d1d76ca1cb97501c82471eb1c927290071dcfb
Merge: f3327b2912d ffbfd18ce2
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 26 19:01:53 2018 +0900
Merge branch 'master-ce' into artifact-format-v2
commit f3327b2912d0b169e7a059dca7b4d15e77567075
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 26 19:01:44 2018 +0900
Fix "or string" to "or a string". Use be_valid
commit 9aaae6d60f7537f55f862f4d61de7a0d3a3b6bc2
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 21:25:57 2018 +0900
Fix spec file name - build_runner_presenter_spec.rb
commit 41c64c190e2e2efa7ab91a0daa0598da2d755f05
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 21:18:12 2018 +0900
Rename to Ci::BuildRunnerPresenter
commit e9762299eb66c8f88734f80d05d38b9616a8fde8
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 21:14:44 2018 +0900
Split methods into three in Ci::Builds::RunnerPresenter
commit 6e73070313a782eb63d4fbcbe324d9acaf67334b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 20:23:53 2018 +0900
Remove redandant as: :artifacts
commit 063f647e4829d9c71a71d227f9946bb47b93691f
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 20:04:58 2018 +0900
Fix specs
commit a45975afd9b9391390c1adafbeab72c970e97b64
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 18:18:53 2018 +0900
Created a separate presenter
commit 431ad666e080124c90e13cbaf0d4f0969aa7b2f2
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 18:10:04 2018 +0900
Simplified config presenter
commit 2e106569ea258f5f7556a8b454a6dd0e9cbe6902
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 17:25:05 2018 +0900
Skip file_format setting if the file_type is trace
commit 0572bd8357a2e9ea16118a0bd85264e3fb799322
Merge: 30ae33daa1d 6cb30f8325
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 17:13:55 2018 +0900
Merge branch 'master-ce' into artifact-format-v2
commit 30ae33daa1d4afcb57e6335fba62a3c5fc98468a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 25 17:13:23 2018 +0900
Fix spec
commit ccb6eb75187030ff0fd3c6e69f89eeca79d2a929
Merge: 1ebaaaf2094 34c57e09b9
Author: Shinya Maeda <shinya@gitlab.com>
Date: Tue Jul 24 14:27:48 2018 +0900
Merge branch 'master-ce' into artifact-format-v2
commit 1ebaaaf2094c47c03e16745d2f8af736ec102b76
Merge: bfdf565800b dc7b4b7bb9
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 23 14:22:29 2018 +0900
Merge branch 'master-ce' into artifact-format-v2
commit bfdf565800b58e838a760aa01d2fadb64e2d768f
Merge: 681bd6a878a 44dbeccbe1
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 19:10:47 2018 +0900
Merge branch 'master-ce' into artifact-format-v2
commit 681bd6a878ad2a77c278f5619b51c542d7382aa2
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 18:19:46 2018 +0900
Specify DOWNTIME=false
commit 59c4e31390e0d616d69babf8ac857e98f2dc774e
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 18:14:44 2018 +0900
Wrap long lines
commit 3d85788edbe73fc74c72854508e47fe259d99236
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 18:05:31 2018 +0900
Checking filr_format and file_type paring
commit 3c92a22faf6278e7a2d1ee13bd978bc659b72452
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 16:07:21 2018 +0900
Fix build presenter spec
commit 36e69897b0524cdee6060c928c03af734afae664
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 16:02:09 2018 +0900
Erase test reports at the proper timing
commit 402ae97ecf7f9e3fe541f2d6abef6e47ab740452
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 15:46:56 2018 +0900
Make GENERAL_ARCHIVE_FILE_TYPE as a single entry
commit 75f75b3f5988398fff0660ca5f04aec756ab03bb
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 15:42:16 2018 +0900
Implement config artifact presenter
commit 9ecaee914defba5f12a7a06375ea2876b4328d7f
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 14:27:54 2018 +0900
Introduce ARCHIVE_LEGACY_TRACES_MIGRATION_VERSION check
commit 34ea9610ab9a249a576ee435f365b9e1fcca7f00
Merge: d88523ca884 b60364c0f3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 20 13:46:52 2018 +0900
Merge branch 'master-ce' into artifact-format-v2
commit d88523ca88420354f61bd36f533c62a6ca474423
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 21:00:40 2018 +0900
Revert unnecessary change
commit d9beb10ede5e4e8abe388fadbd6412640293917a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 20:57:03 2018 +0900
Remove scattering around erase_test_reports!
commit c79f361ca01f8dbc0d395edee5fab7f5a0697934
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 20:53:00 2018 +0900
Rever archive_metadata refactoring (For simplifying)
commit 55bc71a404d8cf5fa87e187f6e88da92ab95afa9
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 20:45:19 2018 +0900
Use array_of_strings_or_string in Command
commit 8a576b18c8ab8ead2344e2885aaf2fde11af0328
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 20:40:06 2018 +0900
Fix spec
commit a2cda62fb922184aaf0e78699e06846c96565e0d
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 18:27:11 2018 +0900
Fix presenter spec
commit 95502e605af9bcf1a61dbeb26f9be4d181f8a7ba
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 18:23:41 2018 +0900
Fix artifact migratable
commit a3930853c93862007ba6814511bc32042c7f4986
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 18:15:41 2018 +0900
Increment migration version to use `file_format` when archiving traces
commit e31121cb5e617b0f05e375c2150ece0e38e5e0d6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 17:57:15 2018 +0900
Impolement job_artifact.test_reports method
commit e54707fdf97392839cb2c4711160bd3bc89da196
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 16:49:27 2018 +0900
Fix erase method
commit 20e95824341af1ebc5877d28dc5eba26f73eddf9
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 16:28:00 2018 +0900
Fix spec
commit 7ade498101d02573b20a2405ebe0bdb8efd8aa3b
Merge: e7be6b2b362 98eccfc44c
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 19 12:37:22 2018 +0900
Merge branch 'master-ce' into artifact-format-v2
commit e7be6b2b3624ba44d56143084731cb9a6168f974
Merge: 5a8d4930e01 9bdc9b1ae6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 18 15:43:36 2018 +0900
Merge branch 'master' into artifact-format-v2
commit 5a8d4930e0127aae311bfa3da70d9ab9637791e3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 18 15:43:28 2018 +0900
Evaluate artifact_format
commit c3ce06aa9bc6481b37a16d175adf0fd1c37a1bc0
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 22:27:46 2018 +0900
Fix sending junit.xml
commit e5ce3668ee65217aba610d5311efd5e82bacddf3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 19:02:06 2018 +0900
Add spec for Gitlab::Ci::Config::Entry::Artifacts
commit ede107caf13fb215045576dcce18e20eec776df1
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 17:58:28 2018 +0900
Revert refactoring
commit 15531ba9feff669b2ac05936e0feaee1856c1571
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 17:57:31 2018 +0900
Revert refactoring
commit 14821f3babcc210bc52e4e825adc8333752fbc88
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 17:55:41 2018 +0900
Add spec for file format. Add spec for config_artifacts
commit 882faeab57ab39d18f72abd9b65d286db92e1011
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 17:20:28 2018 +0900
Add file_format to factory
commit 3cd0513e254db15141cd748f6209179f462974f2
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 17:12:52 2018 +0900
Rename migration file properly
commit f511933b5f618fc47d1512554878913922dfba61
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 17:09:57 2018 +0900
Revert artifacts_archive_file refactoring
commit e295e8cbdee065ee3af6dd82f512729554237cad
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 16:03:26 2018 +0900
Dry up the converion in Entry::Reports
commit b0ffa42f6410be4718e7a36cb21f7b585421750e
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 15:50:42 2018 +0900
Set file_format at callers
commit f3dc7a2e02901c79a9e572514a1b731c680e43cc
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 15:47:51 2018 +0900
Use presenter for presenting artifacts hash to runner
commit e5299526138be90d65cf13368134e734b46f7597
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 14:59:09 2018 +0900
Support deleting junit artifact. Make wording explicit
commit cc81c34acf23323257d190c23030d0a89265bccc
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 14:35:12 2018 +0900
Add changelog
commit abde0f2ab5c5c1d99b2f94a049984877bb5a4d77
Merge: 4c87e5b388f fabf6a5634
Author: Shinya Maeda <shinya@gitlab.com>
Date: Mon Jul 16 13:22:22 2018 +0900
Merge branch 'master' into artifact-format-v2
commit 4c87e5b388fb098fb6da71e17a47fa204033e4ac
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 13 17:33:07 2018 +0900
Fix static analysis
commit bc96346be6990b75da9a36055814b24b5b805707
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 13 16:43:02 2018 +0900
Fix Config::Entry::Artifacts
commit aac284613b9db43e3021198dc5b43b81806f1bce
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 13 14:40:20 2018 +0900
Generalized by DEFAULT_FILE_FORMAT
commit a79299fdbb0ed74000ca37cff8fef8268cd29b13
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 13 13:55:02 2018 +0900
Cleanup API::Entities::JobRequest::Artifacts
commit 1650249214768c23f6f46ec62c0c54448017eeb5
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 13 13:25:52 2018 +0900
Simplified file_type relations
commit 981da91bc4c255ff992870e4e4c4393696f5bece
Merge: e79808425eb 924146a8d6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 13 13:18:20 2018 +0900
Merge branch 'master' into artifact-format-v2
commit e79808425eb63c322a997e71d606d97b85e42048
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 12 18:16:52 2018 +0900
Remove unnecessary change
commit a531bd7487955143489d286a0fb2e5d0984acc52
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 12 17:40:35 2018 +0900
Fix errors typo
commit 57d6f21821c8ad934874c1aac3f627335c64c80d
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 12 13:32:35 2018 +0900
Use the correct type name
commit da4ca63f25a27a1268317952061c81a28516653f
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 12 13:29:21 2018 +0900
Refactor job_artifacts_metadata to job_artifacts_archive_metadata
commit 4098a8f10f92a6efa48080f8925809e251066f9d
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 12 13:23:55 2018 +0900
Add job_artifacts_junit relation
commit 5342f07e100253713dbf50eb303da1977484077f
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 12 13:14:03 2018 +0900
Fix raw to raw?
commit 15e0abcb22d9db3d8ef955e647f0a5d0a49c26b6
Merge: 31252fe8d75 ba38931d90
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 12 13:12:38 2018 +0900
Merge branch 'master' into artifact-format-v2
commit 31252fe8d751319c5390f898f66f0af4a8581013
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 11 19:05:51 2018 +0900
Temporaly use type Hash for reports
commit 583165c0349f40e7be16a8039dbffb4139f94921
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 11 15:27:21 2018 +0900
Revert unnecessary change
commit eb48369b8311b538f46f59a31f4a6d3f8c9e68e1
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 11 15:21:46 2018 +0900
Use file_format raw for trace
commit fb69ae8349d58499ad21965c0d1cf95e2b79a8e3
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 11 15:20:10 2018 +0900
Check the presence of the file_format
commit c0840224bc8789d35da032c2a0ee48aa9f2232aa
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 11 15:16:19 2018 +0900
Add format_restriction validation
commit d64fbd388cb2294447df5185366d8b5016591949
Merge: 7ec81e7c7d1 c2a0a3ab1a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Jul 11 15:11:44 2018 +0900
Merge branch 'master' into artifact-format-v2
commit 7ec81e7c7d115f77d712892dfc79db72b9f5bc7a
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 6 20:23:54 2018 +0900
Artifacts presenter (Halfway)
commit a3ccbe4c3a9b7d3095fe1929dee5fd9c57e168e0
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 6 20:22:52 2018 +0900
Fix schema.rb
commit b630c670c707548799c6852e4465ef94fb4a0572
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 6 19:26:03 2018 +0900
Allow reports type under artifacts. Allow junit keyword in it.
commit e7e37612487b556320d27f4fe0de32cd4ec20720
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 6 19:25:10 2018 +0900
Change column name to artifact_format
commit f3f25d56a7c627f4bb9d91d19de175273a7a6a81
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 6 18:02:21 2018 +0900
Rename metadata to archive_metadata, and compress to file_format
commit d7e0709319ab8fe35a2598a3d484eb89b1885934
Author: Shinya Maeda <shinya@gitlab.com>
Date: Fri Jul 6 17:47:18 2018 +0900
Validate compression. Clean up schema
commit beb5990e7e3bfbb308245dc97284aaf9700bd982
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 5 19:06:54 2018 +0900
Make compression params at the first level
commit 1e2e1c0db5412e1aed3bf47562350c20c69dc1a6
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Jul 5 16:31:03 2018 +0900
Reorganize components
2018-07-27 14:05:34 +09:00
JX Terry
99011a61cf
Add an option to have a private profile on GitLab
2018-07-24 12:46:19 +00:00
Francisco Javier López
c52ab9141c
Fix gitlab import project load
2018-07-23 07:52:15 +00:00
Robert Speicher
6cb52964a6
Expose web_url attribute in PipelineBasic and JobBasic
2018-07-18 15:04:45 -07:00
Jan Provaznik
f665e5b8fb
Fix serialization of LegacyDiffNote
2018-07-18 14:49:52 +00:00
Yorick Peterse
5a55dd9936
Merge branch 'fix-performance-problem-of-tags-query' into 'master'
...
Fix performance problem of tags query
Closes gitlab-com/infrastructure#4550
See merge request gitlab-org/gitlab-ce!20555
2018-07-12 13:50:08 +00:00
Kamil Trzciński
1399eb058b
Fix performance problem of accessing tag list for projects api endpoints
2018-07-12 13:40:43 +02:00
Jarka Kadlecová
8717c7dad9
Revert "Merge branch 'ee-5481-epic-todos' into 'master'"
...
This reverts commit 4d9a3f42f1 , reversing
changes made to ecf9c145f6 .
2018-07-11 18:33:24 +02:00
Phil Hughes
c1322ab992
karma & rubocop fixes
2018-07-05 15:44:55 +01:00
Phil Hughes
5428e91374
only include _html fields when asked for
2018-07-05 15:44:54 +01:00
Phil Hughes
6021ab6f77
added html to response
2018-07-05 15:44:54 +01:00
Francisco Javier López
a7a1531fe5
Web Terminal Ci Build
2018-07-05 13:55:10 +00:00
Sean McGivern
4d9a3f42f1
Merge branch 'ee-5481-epic-todos' into 'master'
...
Port of Todos for epics
See merge request gitlab-org/gitlab-ce!19908
2018-07-04 12:57:37 +00:00
Jan Provaznik
7458ca8ebb
[backend] Addressed review comments
...
* Group filtering now includes also issues/MRs from
subgroups/subprojects
* fixed due_date
* Also DRYed todo controller specs
2018-07-03 09:34:44 +02:00
Jarka Kadlecová
57a44f2da3
Support todos for epics backport
2018-07-03 09:34:44 +02:00
Kamil Trzciński
ca93faf15f
Remove the use of `is_shared` of `Ci::Runner`
2018-06-26 15:53:09 +02:00
Douwe Maan
07e95b0cd4
Expose whether current user can push into a branch on branches API
2018-06-18 12:04:51 +02:00
Jan
4077d4f735
Resolve "Provide ability to retrieve `visibility` level via Snippets API"
2018-06-13 10:28:27 +00:00
Phil Hughes
1f5032ef99
Merge branch '47735-milestone-regression' into 'master'
...
Resolve "Regressions for assigning group milestone from ancestor"
Closes #47735
See merge request gitlab-org/gitlab-ce!19721
2018-06-13 09:47:38 +00:00
Mario de la Ossa
379a6a709a
Sidebar Milestone - Fix wrong URL when selecting a parent group milestone
2018-06-12 17:22:12 -06:00
Leonid Batizhevskii
404ef05002
Added with_statsoption for GET /projects/:id/repository/commits
2018-06-12 17:15:53 +02:00
Rémy Coutable
f4b03f0992
Merge branch '45821-avatar_api' into 'master'
...
Add Avatar API
Closes #45821
See merge request gitlab-org/gitlab-ce!19121
2018-06-06 10:50:34 +00:00
Imre
c8f0e4b5da
Add Avatar API
2018-06-06 10:12:52 +02:00
Mark Chao
0d44f4d50e
Rephrase "maintainer" to more precise "members who can merge to the target branch"
...
"Maintainer" will be freed to be used for #42751
2018-06-01 14:33:12 +09:00
Douwe Maan
cda2c5e76f
Only preload member records for the relevant projects/groups/user in projects API
2018-05-30 15:58:39 +02:00
Phil Hughes
fd79df64c5
Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'
...
Resolve "Squash and merge in GitLab Core (CE)"
Closes #34591
See merge request gitlab-org/gitlab-ce!18956
2018-05-30 07:38:31 +00:00
blackst0ne
4cff66a6c4
Add 'squash and rebase' feature to CE
2018-05-29 20:51:43 +11:00
Rémy Coutable
2b8eb7273e
Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-29 10:38:59 +02:00
Semyon Pupkov
4131a49bb7
Expose artifacts_expire_at field for job entity in api
...
https://gitlab.com/gitlab-org/gitlab-ce/issues/45798
2018-05-26 10:59:42 +05:00
Imre Farkas
10237d458d
Expose readme url in Project API
2018-05-22 10:53:37 +00:00
Lars Greiss
f3440e5963
Expose runner ip address to runners API
...
Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
2018-05-08 00:40:03 +02:00
Tiago Botelho
bddbcaefc2
Backports every CE related change from ee-44542 to CE
2018-05-04 17:33:26 +02:00
Kamil Trzciński
04d07cc5b4
Merge branch 'feature/runner-per-group' into 'master'
...
Shared CI runners for groups
See merge request gitlab-org/gitlab-ce!9646
2018-05-04 09:44:05 +00:00
Rémy Coutable
e50bed7eff
Fix lambda arguments in Grape entities
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-03 18:16:27 +02:00
Dylan Griffith
d39b3d4b8d
Merge branch 'master' into feature/runner-per-group
2018-05-03 09:54:12 +02:00
Jan Provaznik
7a76caa5a8
Merge request and commit discussions API
2018-05-01 12:39:44 +00:00
Alexis Reigel
b55c3a7bc4
support group runners in existing API endpoints
2018-04-23 09:21:43 +02:00
Andrew Beresford
3a4086e22f
Expose the target commit ID through the tag API
...
This is useful for annotated tags, where the deferenced target is not the same as the tag object. At the moment there is no way to differentiate the two through the tag API.
This change adds a "target" property and leaves the existing "commit" property alone so that existing behaviour is not altered.
2018-04-08 20:59:03 +01:00
Douwe Maan
52967b107b
Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6'
...
[10.6] Prevent notes on confidential issues from being sent to chat
See merge request gitlab/gitlabhq!2366
# Conflicts:
# app/helpers/services_helper.rb
2018-04-05 08:41:56 +02:00
Jan
f6d58310fc
Resolve "Allow the configuration of a project's merge method via the API"
2018-04-04 09:56:38 +00:00
Sean McGivern
7c36e8561c
Merge branch '41967_issue_api_closed_by_info' into 'master'
...
Add closed by information to issue API
See merge request gitlab-org/gitlab-ce!17042
2018-03-30 15:43:45 +00:00
Tomasz Maczukin
6ecde0076a
Remove Ci::Build#timeout
2018-03-28 14:00:05 +02:00
Tomasz Maczukin
f5e602ee0f
Rename maximum_job_timeout to maximum_timeout
2018-03-28 13:58:15 +02:00
Tomasz Maczukin
d633bc8134
Rename job_upper_timeout to maximum_job_timeout
2018-03-28 13:55:46 +02:00
Tomasz Maczukin
7b82f4bab1
Add support for job_upper_timeout in API
2018-03-28 13:55:46 +02:00
Bob Van Landuyt
8b2ec23fef
Set `allow_maintainer_to_push` using the API
2018-03-07 16:59:17 +01:00
Sean McGivern
1da5a103ac
Merge branch 'jprovazn-api' into 'master'
...
Add discussion API
See merge request gitlab-org/gitlab-ce!17510
2018-03-07 13:37:50 +00:00
Jan Provaznik
dcdfa04b32
Add discussion API
...
* adds basic discussions API for issues and snippets
* reorganizes notes specs (so same tests can be used for all noteable types - issues, MRs, snippets)
2018-03-07 12:27:50 +01:00
Sean McGivern
39b393fa72
Merge branch '29130-api-project-export' into 'master'
...
Resolve "API endpoint for exporting project"
Closes #29130
See merge request gitlab-org/gitlab-ce!15860
2018-03-06 15:24:14 +00:00
Travis Miller
3e71955bef
review: prefix un-used argument with underscore
2018-03-05 13:55:20 -06:00
Francisco Javier López
8fe880dc06
Projects and groups badges API
2018-03-05 17:51:40 +00:00
haseeb
bb89412ffb
expose metrics in merge request api
2018-03-02 16:48:55 +00:00
Jean-Baptiste Guerraz
20844326f3
align "confidential issues events" implementation with "issues events" one
2018-03-01 10:51:56 +01:00
Travis Miller
a4308c53e5
Add project export API entities
2018-02-28 20:47:36 -06:00
haseeb
f211e47eb2
closed by field added
2018-02-28 19:25:24 +05:30
Nick Thomas
ee68bd9771
Add DNS verification to Pages custom domains
2018-02-23 12:22:29 +00:00
Sean McGivern
feab47e082
Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'
...
Resolve "API endpoint for importing a project export"
Closes #41899
See merge request gitlab-org/gitlab-ce!17025
2018-02-16 14:05:51 +00:00
Douwe Maan
6085656bff
Merge branch 'feature/include-custom-attributes-in-api' into 'master'
...
Allow including custom attributes in API responses
See merge request gitlab-org/gitlab-ce!16526
2018-02-14 10:40:59 +00:00
Sean McGivern
5e829934f9
Merge branch '42934-search-api-fix' into 'master'
...
Add information about projects when searching in wiki_blobs, blobs, commits scopes
Closes #42934
See merge request gitlab-org/gitlab-ce!17095
2018-02-14 10:15:49 +00:00
Robert Schilling
a724f7e35f
Refactor commits/refs API to use hash and add pagination headers
2018-02-14 10:16:34 +01:00
Jarka Kadlecová
b0b4ae1875
API - Include project in commits&blobs search results
2018-02-14 09:00:26 +01:00
James Lopez
4a0d56daac
fix entity
2018-02-13 15:25:48 +01:00
James Lopez
848f49801d
add entity and update spec
2018-02-13 15:25:47 +01:00
Robert Schilling
922d156a5e
Separate branch and tag names
2018-02-09 17:46:41 +01:00
Robert Schilling
4cefb568d9
Incorporate feedback
2018-02-09 14:59:47 +01:00
Robert Schilling
cea2a8f741
Basic ref fetching for commits
2018-02-09 13:25:02 +01:00
Markus Koller
b7cd99c376
Allow including custom attributes in API responses
2018-02-08 13:30:34 +01:00
Jarka Kadlecová
7381944565
Support search in API
2018-02-06 16:02:02 +01:00
Stan Hu
46a6edc731
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
...
We can simplify the code quite a bit and improve performance by using
grape-entity merge fields:
https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields
Relates to #42030
2018-01-30 21:46:09 -08:00
Oswaldo Ferreira
395e500f01
Remove tap and use simplified method call
2018-01-29 16:29:25 -02:00
Oswaldo Ferreira
2944896466
Return more consistent values for merge_status on MR API
2018-01-28 18:50:43 -02:00
Douwe Maan
1db2f22b15
Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"
...
This reverts merge request !16626
2018-01-25 11:12:14 +00:00
Douwe Maan
9f5390d81d
Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'
...
Return more consistent values for merge_status on V4 MR APIs
Closes #20639
See merge request gitlab-org/gitlab-ce!16626
2018-01-24 15:09:16 +00:00
Toon Claes
45b62dfd32
Make the exposing of the Application secret more explicit
...
To make it more clear to developers that the entity exposes the
application secret, define a separate entity that only should be used
when the secret is needed (probably only on creation).
2018-01-24 09:44:07 +01:00
Nicolas MERELLI
81bbcfacb0
Add application create API
2018-01-24 09:42:04 +01:00
Oswaldo Ferreira
dc84313e73
Return more consistent values for merge_status on MR API
2018-01-23 19:08:24 -02:00
Douwe Maan
8e9c073a14
Merge branch 'feature/merge-request-system-hook' into 'master'
...
System hooks for Merge Requests
See merge request gitlab-org/gitlab-ce!14387
2018-01-18 11:37:16 +00:00
Douwe Maan
536a47b4b7
Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3'
...
[10.3] Migrate `can_push` column from `keys` to `deploy_keys_project`
See merge request gitlab/gitlabhq!2276
(cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c)
1f2bd3c0 Backport to 10.3
2018-01-16 17:04:51 -08:00
Stan Hu
0424801ec8
Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3'
...
Filter out sensitive fields from the project services API
See merge request gitlab/gitlabhq!2281
(cherry picked from commit 476f2576444632f2a9a61b4cead9c1077f2c81d7)
2bcbbda0 Filter out sensitive fields from the project services API
2018-01-16 17:04:38 -08:00
Douwe Maan
7acabf7c59
Merge branch 'remove-soft-removals' into 'master'
...
Remove soft removals related code
Closes #37447
See merge request gitlab-org/gitlab-ce!15789
2018-01-11 16:06:01 +00:00
Francisco Javier López
f6c1d38259
Add option to disable commit stats to commit API
2018-01-09 11:36:12 +00:00
Yorick Peterse
d0b8f536a1
Remove soft removals related code
...
This removes all usage of soft removals except for the "pending delete"
system implemented for projects. This in turn simplifies all the query
plans of the models that used soft removals. Since we don't really use
soft removals for anything useful there's no point in keeping it around.
This _does_ mean that hard removals of issues (which only admins can do
if I'm not mistaken) can influence the "iid" values, but that code is
broken to begin with. More on this (and how to fix it) can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/31114 .
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
2018-01-08 17:04:45 +01:00
Dmitriy Zaporozhets
0788b37fba
Merge branch 'api-domains-expose-project_id' into 'master'
...
Expose project_id on /api/v4/pages/domains
See merge request gitlab-org/gitlab-ce!16200
2018-01-05 14:29:37 +00:00
Sean McGivern
0f33ac6442
Merge branch 'backport-issue_3413' into 'master'
...
[EE-backport] Add group boards API endpoint
See merge request gitlab-org/gitlab-ce!16194
2018-01-05 14:17:19 +00:00
Alessio Caiazza
3514b7248c
Add status attribute to runner api entity
2018-01-05 11:10:28 +01:00
Felipe Artur
5e148d4e93
EE-BACKPORT group boards
2018-01-04 17:28:10 -02:00
Alexis Reigel
2a0a7b426e
api support for merge_requests_events system hook
2018-01-04 09:33:41 +01:00
Luc Didry
78cdac8401
Expose project_id on /api/v4/pages/domains
2018-01-03 19:36:54 +01:00
Alessio Caiazza
5e0143a84b
Add online attribute to runner api entity
2018-01-03 14:49:24 +01:00
Mark Fletcher
1e72dd106b
Support new chat notifications parameters in Services API
...
+ Add support for the new separate channel and events settings
* Dry up chat notifications in the service properties definitions
2017-12-22 12:18:05 +00:00
Douwe Maan
8f29d2640f
Merge branch 'rs-security-group-api' into 'security-10-2'
...
[10.2] Ensure we expose group projects using GroupProjectsFinder
See merge request gitlab/gitlabhq!2234
(cherry picked from commit 072f8f2fd6ec794645375a16ca4ddc1cbeb76d7a)
a2240338 Ensure we expose group projects using GroupProjectsFinder
2017-12-08 13:48:14 -08:00
Eric Eastwood
e6ac6734c2
Use relative _path helper URLs in the GitLab UI
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
2017-12-07 11:19:37 -06:00
Grzegorz Bizon
003a816afa
Merge branch 'zj-multiple-artifacts' into 'master'
...
Multiple artifacts
See merge request gitlab-org/gitlab-ce!14367
2017-12-05 14:30:59 +00:00
Zeger-Jan van de Weg
61864a5a5b
Rename Artifact to JobArtifact, split metadata out
...
Two things at ones, as there was no clean way to seperate the commit and
give me feedback from the tests.
But the model Artifact is now JobArtifact, and the table does not have a
type anymore, but the metadata is now its own model:
Ci::JobArtifactMetadata.
2017-12-03 12:04:48 +01:00
Zeger-Jan van de Weg
25df666156
Create Ci::Artifacts
...
To allow jobs/builds to have multiple artifacts, and to start seperating
concerns from Ci::Build a new model is created: Ci::Artifact.
Changes include the updating of the ArtifactUploader to adapt to a
slightly different interface. The uploader expects to be initialized
with a `Ci::Build`.
Futher a migration with the minimal fields, the needed foreign keys and
an index.
Last, the way this works is by prepending a module to Ci::Build so we
can basically override behaviour but if needed use `super` to get the
original behaviour.
2017-12-03 12:04:47 +01:00
Francisco Lopez
3527d1ff2b
Undoing the change to ForkNetworkMember
2017-12-01 18:32:12 +01:00
Francisco Lopez
fe95de8855
Fixed BasicProjectDetail parent
2017-12-01 18:32:12 +01:00
Francisco Lopez
c0c0926acc
Removed binding.pry
2017-12-01 18:32:12 +01:00
Francisco Lopez
c7e7f4444c
Removing blank line
2017-12-01 18:32:12 +01:00
Francisco Lopez
fa6b0a36bd
Changes after rebase
2017-12-01 18:32:12 +01:00
Francisco Lopez
194f7bca9a
Comments from code review applied. Also switched forked_from_project and ForkedProjectLinks to ForkNetworkMember
2017-12-01 18:32:12 +01:00
Francisco Lopez
58c5b463ff
Refactored /projects and /user/:user_id/projects endpoints
2017-12-01 18:32:12 +01:00
Stan Hu
02cd1702b2
Only serialize namespace essentials in group's projects API response
2017-12-01 18:32:12 +01:00
Stan Hu
39d293abd2
Omit the `all` call after Project#project_group_links to avoid unnecessary loads
2017-12-01 18:32:12 +01:00
Tomasz Maczukin
7b643c02c2
Modify output
2017-11-28 00:36:49 +01:00
Tomasz Maczukin
8d3e80692c
Add information about project
2017-11-28 00:36:48 +01:00
Douwe Maan
dbf97574dc
Merge branch '39887-move-identical-check-to-merged-branches' into 'master'
...
Move identical merged branch check to merged_branch_names
Closes #39887
See merge request gitlab-org/gitlab-ce!15464
2017-11-23 15:16:37 +00:00
Markus Koller
257fd57134
Allow password authentication to be disabled entirely
2017-11-23 13:16:14 +00:00
Lin Jen-Shin
7df1cb528e
Move identical merged branch check to merged_branch_names
2017-11-23 18:26:41 +08:00
Travis Miller
1162d89ac4
Add administrative endpoint to list all pages domains
2017-11-13 16:05:44 +00:00
Douwe Maan
8138d58d42
Merge branch '37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request' into 'master'
...
Fetch the merged branches at once in the `/projects/:id/repository/branches` endpoint
See merge request gitlab-org/gitlab-ce!15215
2017-11-07 11:09:00 +00:00
Rémy Coutable
2ec5ae21b8
Merge branch 'add-changes-count-to-merge-requests-api' into 'master'
...
Add changes_count to the merge requests API
See merge request gitlab-org/gitlab-ce!15178
2017-11-07 10:58:03 +00:00
Rémy Coutable
e78c701aff
Pass the Gitlab::Git::Branch object to Repository#merged_to_root_ref?
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-06 16:29:50 +01:00
Rémy Coutable
b20984dea2
Improve performance of the /projects/:id/repository/branches API endpoint
...
Mitigate a N+1 requests to Gitaly problem. Still one left.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-06 13:31:23 +01:00
Mehdi Lahmam
08bc2f946b
Expose `duration` in Job API entity
...
Closes #35794 .
2017-11-05 21:59:58 +01:00
Sean McGivern
9d259c2232
Add changes_count to the merge requests API
...
This returns the `real_size` of the MR's diff, which is a string indicating the
number of changes. If the diff overflows after _n_ files, the string will be
`$n+`.
2017-11-03 14:28:18 +00:00
Douwe Maan
fbdf057898
Remove private_token from API user entity
2017-11-02 11:39:01 +01:00
Travis Miller
bcccf6c161
Add pages domains API entities
2017-10-22 08:04:42 -05:00
Sean McGivern
a68a39e341
Merge branch '18608-lock-issues-v2' into 'master'
...
Resolve "Lock issue and merge request"
Closes #18608
See merge request gitlab-org/gitlab-ce!14531
2017-10-06 16:47:27 +00:00
Vitaliy @blackst0ne Klachkov
c55a9ac4ae
Remove 'Repo' prefix from API entites
2017-10-05 19:48:05 +11:00
Kamil Trzciński
da9d42f2b3
Merge branch '37970-timestamped-ci' into 'master'
...
Hide CI section markers from job trace
See merge request gitlab-org/gitlab-ce!14393
2017-10-03 18:16:54 +00:00
Alessio Caiazza
79e1f33f13
Expose GitLab features to the CI runner
2017-10-03 11:35:23 +02:00
Jarka Kadlecova
c488bcd13e
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues-v2
...
# Conflicts:
# db/schema.rb
2017-10-03 09:37:48 +02:00
Markus Koller
e9eae3eb0d
Support custom attributes on users
2017-09-28 16:49:42 +00:00
Rémy Coutable
6d1498ab4e
Merge branch 'dm-simple-project-avatar-url' into 'master'
...
Expose avatar_url when requesting list of projects from API with simple=true
See merge request gitlab-org/gitlab-ce!14498
2017-09-26 14:28:38 +00:00
Mehdi Lahmam
f696b04cc8
Expose last pipeline details in API response when getting a single commit
...
Closes #35692 .
2017-09-26 13:08:46 +02:00
Douwe Maan
a019369409
Expose avatar_url when requesting list of projects from API with simple=true
2017-09-26 12:47:48 +02:00
Luke "Jared" Bennett
ff7b545c8e
Merge remote-tracking branch 'origin/master' into 18608-lock-issues
2017-09-20 15:23:00 +01:00
Andrew Newdigate
64d7ec0a9e
Detect n+1 issues involving Gitaly
2017-09-19 10:55:37 +00:00
Vitaliy @blackst0ne Klachkov
c0845e837d
Add 'closed_at' attribute to Issues API
2017-09-16 20:51:02 +11:00
Jarka Kadlecova
073ba05d31
Support discussion lock in the API
2017-09-14 14:50:32 +02:00
Annabel Dunstone Gray
9b177bb7c9
Revert "Merge branch 'revert-f2421b2b' into 'master'"
...
This reverts merge request !14148
2017-09-11 15:44:42 +00:00
Rubén Dávila
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
Sean McGivern
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
Sean McGivern
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
Grzegorz Bizon
8ed0a05107
Merge branch 'wiki_api' into 'master'
...
Add API support for wiki pages
Closes #12747
See merge request !13372
2017-09-07 10:38:03 +00:00
blackst0ne
2915bb2707
Add API support for wiki pages
2017-09-07 09:21:52 +11:00
Rubén Dávila
6c49a62800
Restore some changes from !9199
2017-09-06 12:54:09 -05:00
Yorick Peterse
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
micael.bergeron
c9aa793215
revert to using a simple representation
2017-09-06 09:01:53 -04:00
micael.bergeron
bca72f5906
wip: fake its a binary diff
2017-09-06 09:01:53 -04:00
Ashley Dumaine
a3f76b76a4
change collapse to resolve and comments to discussions
2017-09-06 10:07:47 +01:00
Ashley Dumaine
ef4b3a39bc
Add functionality to collapse outdated diff comments regardless of discussion resolution
2017-09-06 10:07:46 +01:00
Robert Schilling
b69579742b
API: Add GPG key management
2017-09-05 14:30:53 +02:00
Shinya Maeda
362f2226a5
Improve by zj nice catches
2017-09-04 21:10:34 +09:00
Shinya Maeda
03f72f0f41
Add spec (Halfway)
2017-09-04 21:10:34 +09:00
Shinya Maeda
8ca5c333fd
Extend API: Pipeline Schedule Variable
2017-09-04 21:10:34 +09:00
Shinya Maeda
6f19fc1147
Add API support
2017-09-03 23:49:10 +09:00
Douwe Maan
7c215dd23d
Merge branch 'master' into issue-discussions-refactor
2017-08-31 09:13:41 +02:00
Travis Miller
749c389345
Add time stats to issue and merge request API end points
2017-08-29 08:31:36 -05:00
Travis Miller
ce1ce82045
Resolve new N+1 by adding preloads and metadata to issues end points
2017-08-29 08:31:36 -05:00
Douwe Maan
834f1b30d5
Merge branch 'master' into issue-discussions-refactor
...
# Conflicts:
# package.json
# spec/support/features/reportable_note_shared_examples.rb
2017-08-17 14:01:31 +02:00
Rémy Coutable
fcce6c3168
Merge branch 'rs-more-public-send-whitelists' into 'master'
...
Whitelist or fix additional `Gitlab/PublicSend` cop violations
See merge request !13467
2017-08-16 11:25:26 +00:00
Robert Speicher
4edfad9678
Enable Layout/TrailingWhitespace cop and auto-correct offenses
2017-08-15 13:44:37 -04:00
Robert Speicher
260c8da060
Whitelist or fix additional `Gitlab/PublicSend` cop violations
...
An upcoming update to rubocop-gitlab-security added additional
violations.
2017-08-14 12:14:11 -04:00
Filipa Lacerda
e93214bce6
Merge branch 'master' into issue-discussions-refactor
...
* master: (66 commits)
fix confidential border issue as well as confidential styles leaking on new MR
Migrate force push check to Gitaly
Add option to disable project export on instance
Better categorize test coverage results
Add option to disable project export on instance - db changes
Better caching and indexing of broadcast messages
Include the `is_admin` field in the `GET /users/:id` API when current user is an admin
Document rspec-retry and rspec-flaky
Fix cop description
Retrieve and sync flaky specs report from and to S3
Use a new RspecFlakyListener to detect flaky specs
Fix formatting of patch_versions.md [skip ci]
Enable Timecop safe mode
Show error message for API 500 error in tests, and
Fix merge request diff deserialisation when too_large was absent
Delete correct key from `session` after authenticating using U2F
Bumps omniauth-ldap gem version to 2.0.4
Pending delete projects no longer return 500 error in Admins projects view
Do not run the `ee_compat_check` job for stableish branches
Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
...
2017-08-12 00:17:48 +01:00
Yorick Peterse
0395c47193
Migrate events into a new format
...
This commit migrates events data in such a way that push events are
stored much more efficiently. This is done by creating a shadow table
called "events_for_migration", and a table called "push_event_payloads"
which is used for storing push data of push events. The background
migration in this commit will copy events from the "events" table into
the "events_for_migration" table, push events in will also have a row
created in "push_event_payloads".
This approach allows us to reclaim space in the next release by simply
swapping the "events" and "events_for_migration" tables, then dropping
the old events (now "events_for_migration") table.
The new table structure is also optimised for storage space, and does
not include the unused "title" column nor the "data" column (since this
data is moved to "push_event_payloads").
== Newly Created Events
Newly created events are inserted into both "events" and
"events_for_migration", both using the exact same primary key value. The
table "push_event_payloads" in turn has a foreign key to the _shadow_
table. This removes the need for recreating and validating the foreign
key after swapping the tables. Since the shadow table also has a foreign
key to "projects.id" we also don't have to worry about orphaned rows.
This approach however does require some additional storage as we're
duplicating a portion of the events data for at least 1 release. The
exact amount is hard to estimate, but for GitLab.com this is expected to
be between 10 and 20 GB at most. The background migration in this commit
deliberately does _not_ update the "events" table as doing so would put
a lot of pressure on PostgreSQL's auto vacuuming system.
== Supporting Both Old And New Events
Application code has also been adjusted to support push events using
both the old and new data formats. This is done by creating a PushEvent
class which extends the regular Event class. Using Rails' Single Table
Inheritance system we can ensure the right class is used for the right
data, which in this case is based on the value of `events.action`. To
support displaying old and new data at the same time the PushEvent class
re-defines a few methods of the Event class, falling back to their
original implementations for push events in the old format.
Once all existing events have been migrated the various push event
related methods can be removed from the Event model, and the calls to
`super` can be removed from the methods in the PushEvent model.
The UI and event atom feed have also been slightly changed to better
handle this new setup, fortunately only a few changes were necessary to
make this work.
== API Changes
The API only displays push data of events in the new format. Supporting
both formats in the API is a bit more difficult compared to the UI.
Since the old push data was not really well documented (apart from one
example that used an incorrect "action" nmae) I decided that supporting
both was not worth the effort, especially since events will be migrated
in a few days _and_ new events are created in the correct format.
2017-08-10 17:45:44 +02:00
Filipa Lacerda
fbf241e8ae
Merge branch 'master' into issue-discussions-refactor
...
* master: (42 commits)
alternative route for download archive
Add missing command to compile GetText files
Prevent user from changing username with container registry tags
Rename RPC 'Exists' to 'RepositoryExists'
Fix the sticky changes bar on commits page
Fix ee_compat_check when EE branch uses a prefix
Removed display styles when hiding the fly out navigation
Explain why we use select all for project_url_constrainer.rb
Fix pikaday being undefined
Add a helper to stub storage settings with defaults
Enable the Layout/SpaceBeforeBlockBraces cop
update Install from Source instructions
Translations can be picked without asking for exceptions
Ask for exceptions in advance
Don't require stackprof in Gemfile
Synchronous Korean translation in zanata
Use full path of user's avatar in webhooks
Update icon color on hover
Align all nav items in sidebar
Fix height of collapsed sidebar items
...
2017-08-10 11:12:22 +01:00
Rémy Coutable
c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 11:52:22 +02:00
Filipa Lacerda
23334ac0a1
Merge branch 'master' into issue-discussions-refactor
...
* master: (481 commits)
Make sure that we have author and committer
disable file upload button while uploading
Fix bar chart does not display label at hour 0
Fixed activity not loading on project homepage
Expose noteable_iid in Note
Fix fly-out width when it has long items
Add a test to show that threshold 40 would corrupt
Add changelog entry
Raise encoding confidence threshold to 50
Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/`
Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/`
Add Italian translations of Pipeline Schedules
Restrict InlineJavaScript for haml_lint to dev and test environment
Incorporate Gitaly's CommitService.FindCommit RPC
Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit
fix repo_edit_button_spec.js
fix test failures in repo_preview_spec.js
fix repo_loading_file_spec tests
Refactor Gitlab::Git::Commit to include a repository
use 100vh instead of flip flopping between the two - works on all suported browsers
...
2017-08-08 16:15:16 +01:00
sue445
7bc0486162
Expose noteable_iid in Note
2017-08-08 11:31:55 +00:00
Rémy Coutable
10fe62ec80
Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/`
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-08 11:50:58 +02:00
Sean McGivern
5bf65c9306
Merge branch 'bvl-nfs-circuitbreaker' into 'master'
...
Circuitbreaker for storage paths
Closes #32207 , #33117 , gitlab-com/infrastructure#1946 , and gitlab-com/infrastructure#1775
See merge request !11449
2017-08-07 14:56:15 +00:00
Filipa Lacerda
e4f8aa719b
Merge branch 'master' into issue-discussions-refactor
...
* master: (162 commits)
Since mysql is not a priority anymore, test it less
Add container registry and spam logs icons
Fix different Markdown styles
Backport to CE for:
Make new dropdown dividers full width
Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
Install yarn via apt in update guides
Use long curl options
Remove monkey-patched Array.prototype.first() and last() methods
Openshift Getting Started
35659 Rename Pipelines tab to CI / CD in new navigation
Don't bother going through an entire Banzai pipeline for empty text
Add active state for pipelines settings on old nav
Bump rspec to 3.6.0
Resolve "Specific Async Script Loading by using a Page Variable"
Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"
another rubocop style fix
Use mixin for new dropdown style
Migrate Repository#last_commit_for_path to Gitaly
Migrate blame loading to Gitaly
...
2017-08-04 19:38:37 +01:00
Bob Van Landuyt
3598e60bf2
Add a Circuitbreaker for storage paths
2017-08-04 15:38:48 +02:00
Tony
3c8b2ae168
Expose more attributes to unauthenticated GET /projects/:id
2017-08-03 16:42:11 +03:00
Rémy Coutable
1b117e7f2d
Merge branch 'api_project_events_target_iid' into 'master'
...
Expose target_iid in Events API
See merge request !13247
2017-08-02 10:34:35 +00:00
Eric
fb5b2d8d0e
Extending API for protected branches
2017-08-02 10:16:17 +00:00
sue445
24704acc77
Expose target_iid in Events API
2017-08-02 16:07:50 +09:00
Douwe Maan
95f9d6d83b
Merge branch 'master' into issue-discussions-refactor
...
# Conflicts:
# app/controllers/concerns/notes_actions.rb
# spec/features/task_lists_spec.rb
# spec/support/features/issuable_slash_commands_shared_examples.rb
2017-07-31 10:23:50 +02:00
Bob Van Landuyt
ea1012ccb4
Make the attribute list for application settings reusable
2017-07-27 11:49:27 +02:00
Sean McGivern
1162257080
Merge branch 'issue_34622' into 'master'
...
Group milestones API endpoint
Closes #34622
See merge request !12819
2017-07-25 12:52:47 +00:00
Oswaldo Ferreira
33dc5171e5
Resolve "More RESTful API: include resource URLs in responses"
2017-07-25 09:35:45 +00:00
Jarka Kadlecova
7bee7b848a
Support both internal and external issue trackers
2017-07-24 08:13:43 +02:00
Douwe Maan
76c3d2d434
Add full JSON endpoints for issue notes and discussions
2017-07-21 22:35:24 +03:00
Felipe Artur
c5c9dce270
Add group milestones API endpoint
2017-07-21 11:00:00 -03:00
Sean McGivern
1afdbe320e
Merge branch 'fixes-for-internal-auth-disabled' into 'master'
...
Fixes needed when GitLab sign-in is not enabled
See merge request !12491
2017-07-14 08:49:36 +00:00
Robin Bobbitt
672a68d372
Fixes needed when GitLab sign-in is not enabled
...
When sign-in is disabled:
- skip password expiration checks
- prevent password reset requests
- don’t show Password tab in User Settings
- don’t allow login with username/password for Git over HTTP requests
- render 404 on requests to Profiles::PasswordsController
2017-07-13 10:08:27 -04:00
Stan Hu
e17ac5705d
Add a simple mode to merge request API
...
The current "basic" merge request API still loads too much data. For integrations
like the Trello Power-up, we just need the basics.
Closes #34920
2017-07-11 06:32:13 -07:00
Stan Hu
88c4248ac7
Remove remaining N+1 queries in merge requests API with emojis and labels
...
Closes #34159
2017-07-08 22:19:34 -07:00
Douwe Maan
820aeb4e8d
Merge branch 'feature/user-agent-details-api' into 'master'
...
Allow admins to retrieve user agent details for an issue or snippet
Closes #29508
See merge request !12655
2017-07-07 17:13:31 +00:00
Felipe Artur
b5f596c3ff
Native group milestones
2017-07-07 15:08:49 +00:00
Rémy Coutable
033acc0120
Fix some N+1 queries in the GET /projects API
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-07 02:38:18 +02:00
James Lopez
2aa95aa018
refactor code based on feedback
2017-07-06 15:27:49 +02:00
James Lopez
383138af61
add issues spec and user agent details to entities
2017-07-06 15:27:48 +02:00
Kamil Trzciński
7f500acb5f
Merge branch '33772-readonly-gitlab-ci-cache' into 'master'
...
Introduce cache policies for CI jobs
Closes #33772
See merge request !12483
2017-07-06 07:40:43 +00:00
Grzegorz Bizon
6afe25ef33
Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'
...
Resolve "Project option to allow customizing CI/CD config path"
Closes #32815 and #33130
See merge request !12509
2017-07-06 07:20:36 +00:00
Douwe Maan
fe13f11041
Create and use project path helpers that only need a project, no namespace
2017-07-05 11:11:59 -05:00
Nick Thomas
35f4a00f37
Introduce cache policies for CI jobs
2017-07-05 15:39:26 +01:00
Lin Jen-Shin
9f5ac179d1
Rename ci_config_file to ci_config_path
2017-07-05 20:11:01 +08:00
Lin Jen-Shin
62fdbbeeb0
Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Config-Path
...
* upstream/master: (123 commits)
Backport changes to Projects::IssuesController and the search bar
bugfix: use `require_dependency` to bring in DeclarativePolicy
Resolve "Select branch dropdown is too close to branch name"
Clean up issuable lists
Defer project destroys within a namespace in Groups::DestroyService#async_execute
Fixed new navgiation bar logo height in Safari
Resolve "Issue dropdown persists when adding issue number to issue description"
Move verification to block level instead of paragraph
Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"
Added code for defining SHA attributes
Minor edits
Job details won't scroll horizontally to show long lines
Run mysql tests on stable preperation branches like 9-3-stable-patch-2
Bring back branches badge to main project page
optimize translation content based on comments
supplement traditional chinese in taiwan translation
Inserts exact matches of username, email and name to the top of the user search list
Remove Namespace model default scope override and write additional test to Project search
optimize translation content based on comments
Limit OpenGraph image size to 64x64
...
2017-06-30 13:46:51 +08:00
Oswaldo Ferreira
bd4c2847f4
Rename members_count to members_count_with_descendants and expose only to group admins
2017-06-28 17:27:01 -03:00
Oswaldo Ferreira
da3e4f4128
Add "members_count" and "parent_id" data on namespaces API
2017-06-28 15:50:29 -03:00
Lin Jen-Shin
35674fcd47
Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Config-Path
...
* upstream/master: (12506 commits)
Update CHANGELOG.md for 9.3.2
Update architecture.md
Fix changelog entry file extension
Fix head pipeline stored in merge request for external pipelines
updated gitlab-ci.yml to compile locale
Ignore JSON files generated from PO files
Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses method that is no longer part of Ruby API
Disable rainbow during SimpleExecutor specs to have consistence
Slightly refactor pipeline schedules form in preparation for additions
Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page"
Make the SimpleExecutor rescue exceptions in the executing Checks
Resolve "Unable to access edit comment from dropdown menu in certain screen sizes"
Update changelog item
revert removal of requestAnimationFrame and move to a separate MR/discussion
rename getEmojiCategoryMap and remove unnecessary parameter
Action Buttons on Prio Labels working again by setting pointer events to none on…
Remove 'contains' option from Commit.find_all
Remove Gitlab::Git::Repository#find_all
Use latest chrome and chrome driver in GitLab QA
Polish sidebar toggle
...
2017-06-28 15:53:12 +08:00
Grzegorz Bizon
0430b76441
Enable Style/DotPosition Rubocop 👮
2017-06-21 13:48:12 +00:00
Rémy Coutable
18ef5be6c4
Merge branch 'dt/printing-to-api' into 'master'
...
add printing_merge_request_link_enabled to API
See merge request !12240
2017-06-21 09:00:57 +00:00
Mike Ricketts
0e7478064f
Re-instate is_admin flag in users API is current user is an admin
2017-06-20 14:54:29 +00:00
David Turner
1cd1bab3af
add printing_merge_request_link_enabled to API
2017-06-19 13:33:15 -04:00
Douwe Maan
6bdfeff6e7
Merge branch 'help-landing-page-customizations' into 'master'
...
Allow more customization to Help landing page
See merge request !11878
2017-06-14 17:16:50 +00:00
Robin Bobbitt
e09ddc62b3
Help landing page customizations
2017-06-14 11:40:21 -04:00
Tomasz Maczukin
fa0a326bf2
Rename API::Entities::JobRequest::ServiceImage to API::Entities::JobRequest::Service
2017-06-12 12:58:36 +02:00
Tomasz Maczukin
c70e9f2ed1
Send new configuration options with job's payload
2017-06-12 12:58:35 +02:00
Phil Hughes
563ea34692
Merge branch '12910-snippets-description' into 'master'
...
Support descriptions for snippets
Closes #31894
See merge request !11071
2017-06-07 09:26:48 +00:00
Douwe Maan
70b927a55c
Merge branch 'projects-api-import-status' into 'master'
...
Expose import_status in Projects API
Closes #19646
See merge request !11851
2017-06-02 22:16:54 +00:00
Robin Bobbitt
c2516115e3
Expose import_status in Projects API
2017-06-02 15:35:51 -04:00
Kamil Trzciński
950db1bd64
Merge branch '24196-protected-variables' into 'master'
...
Implementation for protected variables
Closes #24196
See merge request !11688
2017-06-01 17:18:03 +00:00
Sean McGivern
04251829ba
Merge branch 'dm-collapsed-blob' into 'master'
...
Consistent diff and blob size limit names
See merge request !11776
2017-06-01 09:10:53 +00:00
Kamil Trzciński
3cc138d824
Merge branch 'master' into '24196-protected-variables'
...
# Conflicts:
# db/schema.rb
2017-06-01 07:25:48 +00:00
Alejandro Rodríguez
671284ba37
Add feature toggles through Flipper
2017-05-31 21:06:01 +00:00
Douwe Maan
04cf618b6f
Change no_limits to limits
2017-05-31 14:41:25 -05:00
Lin Jen-Shin
554426ddca
Merge remote-tracking branch 'upstream/master' into 24196-protected-variables
...
* upstream/master: (141 commits)
Add Documentation for GIT_CHECKOUT variable
Ui improvements for count badges and permission badges
Rename the other jobs
Update jobs_spec for changes from builds_spec
Update docs related to protected actions
Add changelog for protected branches abilities fix
Ask for an example project for bug reports
Center loading spinner in issuable filters
Fix chat commands specs related to protected actions
Fix builds controller specs related to protected actions
Fix pipeline retry specs related to protected actions
Fix environment model specs related to protected actions
Fix build factory specs related to protected actions
Fix job play service specs related to protected actions
Fix play status specs related to protected actions
Fix deploy chat command specs for protected actions
Fix environment specs related to protected actions
Use another scope to add the - prefix, feedback:
Fix pipeline processing specs related to protected actions
Fix build entity specs related to protected actions
...
2017-06-01 03:39:47 +08:00
Lin Jen-Shin
afc1fac039
Merge remote-tracking branch 'upstream/master' into 24196-protected-variables
...
* upstream/master: (89 commits)
Revert "Merge branch 'grpc-1.3.4' into 'master'"
Return nil when looking up config for unknown LDAP provider
Avoid crash when trying to parse string with invalid UTF-8 sequence
Enable Gitaly by default in GitLab 9.3
Don’t create comment on JIRA if link already exists
Disable sub_group_issuables_spec.rb for mysql
Fix math rendering on blob pages
Add changelog
Don't allow to pass a user to ProjectWiki#http_url_to_repo
Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
Fix bottom padding for build page
Fix /unsubscribe slash command creating extra todos
Fix omniauth-google-oauth2 dependencies in Gemfile.lock
Update looks job log
'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
Fix spec for Members::AuthorizedDestroyService
31616-add-uptime-of-gitlab-instance-in-admin-area
Set head pipeline when creating merge requests
Create a separate helper to check if we show particular tab on a search page
Add performance deltas between app deployments on Merge Request widget
...
2017-05-31 19:07:27 +08:00
Jarka Kadlecova
4464c22d6d
Support descriptions for snippets
2017-05-31 07:17:03 +02:00
Shinya Maeda
b17c8d67d8
Use PipelineScheduleDetails
2017-05-30 23:55:09 +09:00
Shinya Maeda
bfa028e13a
Remove deleted_at from Entity. Use find_by. Remove returns.
2017-05-30 23:55:09 +09:00
Shinya Maeda
f6a8894a59
Expose last_pipeline only when detailed status
2017-05-30 23:55:09 +09:00
Shinya Maeda
20a07d26ff
Include owner for pipeline_schedules. Improve N+1 spec. Use PipelineBasic for small payload.
2017-05-30 23:55:09 +09:00
Shinya Maeda
17b9128b30
includes last_pipeline
2017-05-30 23:55:09 +09:00
Shinya Maeda
94f7595b9a
Define last_pipeline in PipelineScheduleEntity
2017-05-30 23:55:09 +09:00
Shinya Maeda
97bf240199
Remove if from last_pipeline in entity
2017-05-30 23:55:08 +09:00
Shinya Maeda
fbd3b3d8a2
Add API support for pipeline schedule
2017-05-30 23:55:08 +09:00
Douwe Maan
aed0387f97
Consistent diff and blob size limit names
2017-05-29 17:02:02 -05:00
Douwe Maan
26bcef97d6
Merge branch 'rework-authorizations-performance' into 'master'
...
Rework project authorizations and nested groups for better performance
See merge request !10885
2017-05-29 15:49:56 +00:00
Lin Jen-Shin (godfat)
b5e8de5c4c
Merge branch 'master' into '24196-protected-variables'
...
# Conflicts:
# db/schema.rb
2017-05-26 19:18:07 +00:00
Lin Jen-Shin
bd66bf08b5
API and doc for protected variables
2017-05-25 19:49:46 +08:00
Douwe Maan
d9a0188d2f
Add question mark to Gitlab::Diff::File predicate methods
2017-05-23 15:37:04 -05:00
Yorick Peterse
34974258bc
Hide nested group UI/API support for MySQL
...
This hides/disables some UI elements and API parameters related to
nested groups when MySQL is used, since nested groups are not supported
for MySQL.
2017-05-17 20:53:16 +02:00
Douwe Maan
1fd83f972c
Merge branch 'bvl-rename-build-events-to-job-events' into 'master'
...
Rename `build_events` to `job_events`
Closes #31620
See merge request !11287
2017-05-16 14:12:19 +02:00