ed75b46cd9
Update tests and Resources to use new file button
...
The 'Create new' dropdown is no longer available on a blank project
so use the 'New file' button instead.
2018-12-10 13:10:12 -05:00
c61c5cf2d9
Update E2E tests for Project overview UI changes
...
Includes updates to how clone URLs are accessed.
2018-12-10 13:07:38 -05:00
3f2418b2c3
Merge branch 'fail-danger-in-ci' into 'master'
...
Don't allow Danger to fail in CI any more
Closes gitlab-org/release/framework#21
See merge request gitlab-org/gitlab-ce!23695
2018-12-10 16:49:58 +00:00
e1064f16a8
Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'
...
Fix a frozen string error in lib/gitlab/utils.rb
Closes #55116
See merge request gitlab-org/gitlab-ce!23690
2018-12-10 16:47:15 +00:00
eadd53b969
Merge branch 'sh-remove-gitlab-shell-include' into 'master'
...
Remove unnecessary includes of ShellAdapter
See merge request gitlab-org/gitlab-ce!23607
2018-12-10 16:22:53 +00:00
cd82c38916
Merge branch 'winh-timecop-frontend-fixtures' into 'master'
...
Set a fixed date for frontend fixtures
See merge request gitlab-org/gitlab-ce!22672
2018-12-10 16:01:10 +00:00
849778d146
Merge branch 'backport-ee-helper-changes' into 'master'
...
Backport some EE helper changes
See merge request gitlab-org/gitlab-ce!23631
2018-12-10 15:48:01 +00:00
09cf551413
Don't allow Danger to fail in CI any more
...
In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20654 this job
was marked as allowing failures, but this allows developers to ignore
the results that Danger produces. Since it's not clear why the job was
allowed to fail, and since it's somewhat counter productive, we no
longer allow it to fail.
2018-12-10 16:43:51 +01:00
7dd8ef3e26
Merge branch 'dimitrieh-master-patch-42734' into 'master'
...
Improve feature proposal template for improved product thinking
See merge request gitlab-org/gitlab-ce!23190
2018-12-10 15:23:18 +00:00
af080a1994
Improve feature proposal template for improved product thinking
2018-12-10 15:23:18 +00:00
f233c3bce0
Fix a frozen string error in lib/gitlab/utils.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-10 16:08:58 +01:00
80eebd8e33
Merge branch '55104-frozenerror-can-t-modify-frozen-string' into 'master'
...
Fix a frozen string error in app/mailers/notify.rb
Closes #55104
See merge request gitlab-org/gitlab-ce!23683
2018-12-10 14:37:42 +00:00
42d37c1b06
Merge branch 'winh-dropdown-item-padding' into 'master'
...
Adjust dropdown item and header padding to comply with design specs
See merge request gitlab-org/gitlab-ce!23552
2018-12-10 14:29:16 +00:00
b0f4ad2e06
Adjust dropdown item and header padding to comply with design specs
2018-12-10 14:29:16 +00:00
2d85d362c6
Merge branch '55090-fix-group-clusters-no-project-namespace' into 'master'
...
Resolve "Project Namespace field should be removed from Group Cluster, Add existing"
Closes #55090
See merge request gitlab-org/gitlab-ce!23679
2018-12-10 14:14:38 +00:00
355aa02dc7
Merge branch 'qa-reuse-chrome-profile' into 'master'
...
Add QA option to use the same Chrome profile
Closes #52255
See merge request gitlab-org/gitlab-ce!23576
2018-12-10 13:30:55 +00:00
ecda32eaa2
Extract Clusters::BuildService
2018-12-10 14:14:20 +01:00
d78272a13b
Fix a frozen string error in app/mailers/notify.rb
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-10 13:59:33 +01:00
d32e91d0cf
Set a fixed date for frontend fixtures
2018-12-10 13:47:38 +01:00
f6d8fb6e46
Merge branch '39727-registry' into 'master'
...
Replaces vue-resource with axios for registry code
See merge request gitlab-org/gitlab-ce!23545
2018-12-10 12:38:44 +00:00
5c5a5992c0
Merge branch 'sh-ignore-arrays-url-sanitizer' into 'master'
...
Only allow strings in URL::Sanitizer.valid?
Closes #55079
See merge request gitlab-org/gitlab-ce!23675
2018-12-10 12:03:01 +00:00
5f8a3302d6
Merge branch 'fix-warnings' into 'master'
...
Fix already initialized constant IDENTIFIER warning
See merge request gitlab-org/gitlab-ce!23681
2018-12-10 12:00:50 +00:00
e8d187ca15
Merge branch 'sh-reject-refs-with-invalid-chars' into 'master'
...
Check for valid refs in CommitController before doing anything
Closes gitaly#1425
See merge request gitlab-org/gitlab-ce!23680
2018-12-10 11:57:59 +00:00
5b56b78662
Merge branch 'revert-88c0984d' into 'master'
...
Revert "Merge branch 'bvl-reenable-codeowners' into 'master'"
See merge request gitlab-org/gitlab-ce!23684
2018-12-10 11:56:39 +00:00
c79c8739b6
Merge branch '54626-able-to-download-a-single-archive-file-with-api-by-ref-name' into 'master'
...
Add endpoint to download single artifact by ref
Closes #54626
See merge request gitlab-org/gitlab-ce!23538
2018-12-10 10:52:30 +00:00
237e860b0a
Revert "Merge branch 'bvl-reenable-codeowners' into 'master'"
...
This reverts merge request !23381
2018-12-10 10:52:04 +00:00
5a727a4d36
Merge branch 'osw-update-mr-metrics-with-events-data' into 'master'
...
Populate MR metrics with events table information (migration)
Closes #41587
See merge request gitlab-org/gitlab-ce!23564
2018-12-10 09:39:07 +00:00
853ba4b68a
Merge branch 'auto-devops-use-new-reports-syntax-for-sast' into 'master'
...
Use new reports syntax for SAST in Auto DevOps
See merge request gitlab-org/gitlab-ce!23163
2018-12-10 09:35:29 +00:00
66d868afe9
Use new reports syntax for SAST in Auto DevOps
2018-12-10 09:35:29 +00:00
5618606301
Merge branch 'commit-badge-style-fix' into 'master'
...
Fixed styling of image comment badges on commits
Closes #54849
See merge request gitlab-org/gitlab-ce!23659
2018-12-10 08:55:47 +00:00
f124328b29
Merge branch '8400-operations-check-ce' into 'master'
...
Backport operations_path helper
See merge request gitlab-org/gitlab-ce!23654
2018-12-10 08:37:37 +00:00
20526df988
Fix already initialized constant IDENTIFIER warning
...
/app/spec/uploaders/personal_file_uploader_spec.rb:3: warning: already initialized constant IDENTIFIER
/app/spec/uploaders/namespace_file_uploader_spec.rb:3: warning: previous definition of IDENTIFIER was here
2018-12-10 11:00:08 +05:00
384a92b736
Check for valid refs in CommitController before doing anything
...
Before a 404 would be rendered only after a request to Gitaly would
return with an InvalidArgument error. Now we check that the ref have a
valid format before sending it to Gitaly. In both cases, a 404 is
returned to the user, but this change prevents Gitaly from generating
error noise in production.
Closes https://gitlab.com/gitlab-org/gitaly/issues/1425
2018-12-09 21:56:31 -08:00
01dc3c966f
Refactor to re-use similar block
2018-12-10 13:57:19 +13:00
22289352be
Set cluster_type for a new cluster
...
This enables #allow_user_defined_namespace? to work so that the form for
a group cluster will now longer show the "Project namespace" field.
2018-12-10 13:57:19 +13:00
6cbc982cee
Add failing feature spec
...
That shows that we cannot create a new group cluster
2018-12-10 13:57:16 +13:00
401be1d17f
Only allow strings in URL::Sanitizer.valid?
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55079
2018-12-09 07:59:54 -08:00
19dc87a2eb
Add operations_path helper
2018-12-08 13:05:02 +01:00
7cb0dd9859
Merge branch 'kp-issue_6086' into 'master'
...
CE Backport: Epic issue list and related issue list re-design
See merge request gitlab-org/gitlab-ce!23658
2018-12-08 09:58:45 +00:00
295e8b9bed
CE Backport: Epic issue list and related issue list re-design
2018-12-08 09:58:45 +00:00
6018259f73
Merge branch '51122-fix-navigating-discussions' into 'master'
...
Resolve "Navigating unresolved discussions on Merge Request page"
Closes #51122
See merge request gitlab-org/gitlab-ce!22789
2018-12-08 07:19:03 +00:00
85daddbec9
Resolve "Navigating unresolved discussions on Merge Request page"
2018-12-08 07:19:03 +00:00
f3299596c7
Merge branch '50157-extended-user-centric-tooltips' into 'master'
...
Resolve "Extended user centric tooltips"
Closes #50157
See merge request gitlab-org/gitlab-ce!23231
2018-12-08 03:12:23 +00:00
ddd4cc649f
Resolve "Extended user centric tooltips"
2018-12-08 03:12:23 +00:00
a89b526950
Merge branch 'ce-jej/group-saml-sso-button-link-description' into 'master'
...
[CE] Backport SAML unlink changes: UrlBlocker#ascii_only
See merge request gitlab-org/gitlab-ce!23627
2018-12-08 03:02:18 +00:00
5fc492de78
Merge branch '53147-utilize-new-charting-library-for-metrics-dashboard' into 'master'
...
Resolve "Utilize new charting library for metrics dashboard"
See merge request gitlab-org/gitlab-ce!23459
2018-12-08 02:58:57 +00:00
a22e01aece
Merge branch 'integrate-csslab' into 'master'
...
Integrate csslab
Closes csslab#1
See merge request gitlab-org/gitlab-ce!23521
2018-12-08 01:16:46 +00:00
a73f2ec6b5
Integrate csslab
2018-12-08 01:16:46 +00:00
4fb5e47928
Merge branch '55054-correlation-ids-being-passed-through-grpc-metadata-are-incorrect' into 'master'
...
Fix for incorrect Correlation-ID key being passed through GRPC metadata
Closes #55054
See merge request gitlab-org/gitlab-ce!23666
2018-12-08 00:27:19 +00:00
e13345c0ba
Merge branch 'winh-kushal-codeowners' into 'master'
...
Add Kushal to frontend CODEOWNERS
See merge request gitlab-org/gitlab-ce!23664
2018-12-08 00:03:23 +00:00
Mark Lapierre
Rémy Coutable
Douwe Maan
Robert Speicher
Yorick Peterse
Dimitrie Hoekstra
Kushal Pandya
Winnie Hellmann
Kamil Trzciński
Sanad Liaquat
Dylan Griffith
Phil Hughes
Grzegorz Bizon
Fabio Busatto
Filipa Lacerda
Semyon Pupkov
Stan Hu
Thong Kuah
Matija Čupić
André Luís
Clement Ho
Tim Zallmann
Annabel Dunstone Gray