c598283a16
Merge branch '38869-issue' into 'master'
...
Remove issue and issue status select from global namespace
See merge request gitlab-org/gitlab-ce!15090
2017-10-31 13:14:38 +00:00
682923b79b
Merge branch '3674-hashed-storage-attachments' into 'master'
...
Hashed Storage support for Attachments
See merge request gitlab-org/gitlab-ce!15068
2017-10-31 12:18:47 +00:00
19bf710354
Merge branch '39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails' into 'master'
...
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
Closes #39619
See merge request gitlab-org/gitlab-ce!15088
2017-10-31 11:58:38 +00:00
e829d5a084
Merge branch 'add-packagist-project-service' into 'master'
...
Add Packagist project service
See merge request gitlab-org/gitlab-ce!14493
2017-10-31 11:54:49 +00:00
9c41c7ac1e
Make `#hashed_storage?` require feature argument
2017-10-31 12:13:48 +01:00
68d1e9d1c4
Upload files through the multi-file editor
2017-10-31 10:47:10 +00:00
7e78db6e04
Merge branch '39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses' into 'master'
...
Resolve "Emails on Push are sent to only the first recipient when using AWS SES"
Closes #39593
See merge request gitlab-org/gitlab-ce!15083
2017-10-31 10:24:29 +00:00
980f29716f
Resolve "Convert autosize.js library to be a Yarn managed library"
2017-10-31 09:18:30 +00:00
6a4534b62f
Code Style changes and `hashed_storage?` now receives optional feature
2017-10-31 02:00:40 +01:00
1c978aff62
Fix broken test
2017-10-30 19:50:17 +00:00
ff1e3a47c4
Fix namespacing for MergeWhenPipelineSucceedsService in MR API
2017-10-30 17:19:51 +00:00
f165b609b4
Merge branch '39570-performance-bar-appears-enabled-even-though-it-won-t-show-up' into 'master'
...
Resolve "Performance bar appears enabled even though it won't show up"
Closes #39570
See merge request gitlab-org/gitlab-ce!15084
2017-10-30 16:09:09 +00:00
d7942f223c
Allow to disable the Performance Bar and document the `p b` shortcut in its doc page
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-30 16:13:15 +01:00
2d5c4532f1
Merge branch '38869-importer_status' into 'master'
...
Remove code from global namespace
See merge request gitlab-org/gitlab-ce!15058
2017-10-30 14:53:22 +00:00
391195f32b
Merge branch '39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestone' into 'master'
...
Fix call stack size exceeded group milestone description autocomplete
Closes #39020
See merge request gitlab-org/gitlab-ce!14972
2017-10-30 13:58:34 +00:00
eddc9e41a6
Only set Auto-Submitted header once
...
The emails on push feature reuses the same email object, to avoid the expensive
work of generating the email body.
This interceptor would previously set multiple values for the same header, as
that's the mail gem's default behaviour when called with the same header more
than once.
We don't want to change the emails on push service (although it's the only place
where this happens), but fixing the interceptor is just as sensible anyway.
2017-10-30 13:50:19 +00:00
c06eb779a3
Use the Hashed Storage compatible layer to store Attachments
2017-10-30 14:30:41 +01:00
7ba7fa5048
Fix 500 error for old (somewhat) MRs
2017-10-30 12:30:31 +00:00
46d8209e8c
Merge branch 'master' into 38869-importer_status
...
* master: (51 commits)
Move locked check to a guard-clause
Ci::Build tag is a trait instead of an own factory
[CE backport] Saved configuration for issue board
Use the correct project visibility in system hooks
Add changelog
more readable changelog
Make merge_jid handling less stateful in MergeService
Fetch the merged branches at once
remove extra whitespace
use a delegate for `username` to be more future friendly
Merging EE doc into CE
add changelog entry
Avoid using Rugged in Gitlab::Git::Wiki#preview_slug
Cache commits on the repository model
Remove groups_select from global namespace & simplifies the code
Change default disabled merge request widget message to "Merge is not allowed yet"
Semi-linear history merge is now available in CE.
Remove repetitive karma spec
Improve spec to check hidden component
Rename to shouldShowUsername
...
2017-10-30 11:19:07 +00:00
6919f6361c
Merge branch 'zj-tag-trait-ci-build' into 'master'
...
Ci::Build tag is a trait instead of an own factory
See merge request gitlab-org/gitlab-ce!15077
2017-10-30 11:18:31 +00:00
609f4048dd
Merge branch 'make-merge-jid-handling-less-stateful' into 'master'
...
Fix widget of locked merge requests not being presented
See merge request gitlab-org/gitlab-ce!15069
2017-10-30 11:18:04 +00:00
8275e34e41
Ci::Build tag is a trait instead of an own factory
...
Minor annoyance of mine, and there were a couple of things wrong, for
example:
1. Switching on a property is just a trait
2. It didn't inherrit from its parent
Find and replace through the code based fixed all occurances.
2017-10-30 10:25:30 +01:00
192049a610
Merge branch 'bvl-fix-system-hook-project-visibility' into 'master'
...
Use the correct project visibility in system hooks
Closes #39496
See merge request gitlab-org/gitlab-ce!15065
2017-10-30 08:53:27 +00:00
f03700f5e4
Merge branch '39366-email-confirmation-fails' into 'master'
...
grab the correct username when confirming secondary email
Closes #39366
See merge request gitlab-org/gitlab-ce!15010
2017-10-30 08:53:24 +00:00
7dbf114f59
Use the correct project visibility in system hooks
2017-10-30 09:05:06 +01:00
a6c52c4e59
Make merge_jid handling less stateful in MergeService
2017-10-27 22:33:48 +02:00
b19076948d
Moved renaming operations to storage layer abstraction
...
When project storage_version is `2` means attachments are using
hashed storage.
2017-10-27 21:27:17 +02:00
57d7ed05d9
Fetch the merged branches at once
2017-10-27 15:55:08 +00:00
34254e1d58
remove extra whitespace
2017-10-27 17:35:40 +02:00
a2894b7ad2
use a delegate for `username` to be more future friendly
2017-10-27 16:32:48 +02:00
15e3d33761
Merge branch 'zj-commit-cache' into 'master'
...
Cache commits on the repository model
See merge request gitlab-org/gitlab-ce!14863
2017-10-27 13:31:05 +00:00
ab9b54f977
Merge branch 'add-user-avatar-username-link' into 'master'
...
Add configurable option to display username in user avatar link component
See merge request gitlab-org/gitlab-ce!14902
2017-10-27 12:50:58 +00:00
172ebcb8bb
Merge branch 'ac-k8s-namespace-validator' into 'master'
...
Sanitize k8s default_namespace
Closes #38692
See merge request gitlab-org/gitlab-ce!15053
2017-10-27 12:04:22 +00:00
fa3b473660
Merge branch '39441-bring-edit-form-back' into 'master'
...
Revert "Merge branch '36670-remove-edit-form' into 'master'"
Closes #39441
See merge request gitlab-org/gitlab-ce!15049
2017-10-27 11:54:57 +00:00
e9d3526123
Merge branch '39188-change-default-disabled-merge-message' into 'master'
...
Change default disabled merge request widget message to be more general
Closes #39188
See merge request gitlab-org/gitlab-ce!14960
2017-10-27 11:07:22 +00:00
3411fef1df
Cache commits on the repository model
...
Now, when requesting a commit from the Repository model, the results are
not cached. This means we're fetching the same commit by oid multiple times
during the same request. To prevent us from doing this, we now cache
results. Caching is done only based on object id (aka SHA).
Given we cache on the Repository model, results are scoped to the
associated project, eventhough the change of two repositories having the
same oids for different commits is small.
2017-10-27 12:49:11 +02:00
fed51d1eaa
Remove groups_select from global namespace & simplifies the code
2017-10-27 09:05:03 +00:00
b7835587e5
Change default disabled merge request widget message to "Merge is not allowed yet"
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39188
2017-10-27 04:52:30 -04:00
4e8010aa9d
Remove repetitive karma spec
2017-10-27 16:21:56 +08:00
b1b596be89
Improve spec to check hidden component
2017-10-27 16:20:53 +08:00
94743e0e8f
Remove issuable form from global namespace
2017-10-26 23:21:55 +03:00
a665a35438
Remove issuableContext from global namespace
2017-10-26 23:14:46 +03:00
cf542f9ed0
Improves issuable tests
...
Fixes missing dependencies
2017-10-26 23:06:06 +03:00
3aafcc16fb
Add KubernetesService#default_namespace tests
2017-10-26 18:18:11 +02:00
17b4367045
Revert "Merge branch '36670-remove-edit-form' into 'master'"
...
This reverts commit 915e35a2999533786f52
2017-10-26 15:53:55 +01:00
6798bab12a
Remove duped tests
...
Likely caused by EE conflicts resolution
2017-10-26 16:04:28 +02:00
98c57e9a9f
Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'
...
Add path attribute to WikiFile class
Closes #39420
See merge request gitlab-org/gitlab-ce!15019
2017-10-26 11:41:04 +00:00
7ece18f141
Merge branch 'gl-username-hook-fix' into 'master'
...
Fix the incorrect value being used to set GL_USERNAME on hooks
See merge request gitlab-org/gitlab-ce!15038
2017-10-26 11:31:01 +00:00
cd08fd2363
Merge branch 'non-existing-repo-optimization' into 'master'
...
Avoid calling underlying methods on non-existing repos
See merge request gitlab-org/gitlab-ce!14962
2017-10-26 11:29:46 +00:00
c29d2c6a41
Merge branch 'api-configure-jira' into 'master'
...
Validate username/pw for Jiraservice, require them in the API
Closes #36621
See merge request gitlab-org/gitlab-ce!15025
2017-10-26 11:20:48 +00:00
Phil Hughes
Douwe Maan
Rémy Coutable
Kamil Trzciński
Gabriel Mazetto
Tim Zallmann
Filipa Lacerda
Mark Fletcher
Sean McGivern
Fatih Acet
Sean McGivern
AlexWayfer
Grzegorz Bizon
Zeger-Jan van de Weg
Bob Van Landuyt
Oswaldo Ferreira
Lin Jen-Shin (godfat)
Brett Walker
Eric Eastwood
Clement Ho
Alessio Caiazza