760a154a03
Fix tests for initial status
2017-11-07 14:52:11 +01:00
16b9e289fd
Do not use RSpec.describe
2017-11-07 14:05:58 +01:00
bbdb0cf051
Merge branch 'master' into 38464-k8s-apps
2017-11-07 21:23:54 +09:00
4338823416
Merge branch '39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue' into 'master'
...
Resolve "When reopening an issue the Mattermost Notification has no context to the issue"
Closes #39791
See merge request gitlab-org/gitlab-ce!15218
2017-11-07 11:35:26 +00:00
31e3ef93e5
Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'
...
Support custom attributes on groups and projects
See merge request gitlab-org/gitlab-ce!14593
2017-11-07 10:59:38 +00:00
f9364929ba
Rename application_helm factory to cluster_application_helm
2017-11-07 10:10:57 +01:00
dab3075a36
Merge branch 'master' into 38464-k8s-apps
2017-11-07 16:52:55 +09:00
c71cf908cd
Merge branch 'refactor-clusters' into 'master'
...
Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform
See merge request gitlab-org/gitlab-ce!14879
2017-11-06 21:21:27 +00:00
045795d0d9
Merge branch 'remove-ensure-ref-fetched-from-controllers' into 'master'
...
removed the #ensure_ref_fetched from all controllers
Closes #36061
See merge request gitlab-org/gitlab-ce!15129
2017-11-06 17:10:18 +00:00
ad118080cf
Merge branch 'dm-block-group-and-project-creation-when-external-by-default' into 'master'
...
Make sure group and project creation is blocked for new users that are external by default
Closes #39664
See merge request gitlab-org/gitlab-ce!15212
2017-11-06 15:48:08 +00:00
d934d6504a
updated the ignore_column concern to support multiple columns
...
This method is an ActiveRecord extension and it should behave
like one. I expected this to work.
2017-11-06 10:20:20 -05:00
ef2c5e321d
Merge branch 'dm-reallow-project-path-ending-in-period' into 'master'
...
Reallow project paths ending in periods
Closes #39695
See merge request gitlab-org/gitlab-ce!15190
2017-11-06 14:58:14 +00:00
5e7d68ef79
Fix issue reopen Mattermost / Slack message
...
When an issue is reopened, the action is 'reopen', but the state is 'opened' (as
we don't have a separate 'reopened' state any more).
Because we checked the action in one method and the state in another, this lead
to a weird case where the mesage neither linked to the issue, nor contained an
attachment with its details. Just checking the action is fine, as it's the most
granular.
2017-11-06 14:40:13 +00:00
5ab3ed7a9a
align with the comments
2017-11-06 09:23:41 -05:00
634a152760
Make sure group and project creation is blocked for new users that are external by default
2017-11-06 15:19:15 +01:00
a99ad59e65
Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory name. Use ArgumentError
2017-11-06 23:06:10 +09:00
a10925e1c3
Reallow project paths ending in periods
2017-11-06 14:46:53 +01:00
377916ed72
Merge branch 'master' into refactor-clusters
2017-11-06 20:44:38 +09:00
d4ceec9d47
Merge branch 'ce-gitlab-git-backport' into 'master'
...
CE repository mirroring changes backport
See merge request gitlab-org/gitlab-ce!15184
2017-11-06 10:39:36 +00:00
1f773a8ef5
Support custom attributes on groups
2017-11-06 10:51:50 +01:00
6902848a9c
Support custom attributes on projects
2017-11-06 10:51:46 +01:00
c1f064cbe3
Remove unique validation from external_url in Environment
2017-11-06 16:00:39 +09:00
b737282ac7
Merge branch 'master' into refactor-clusters
2017-11-05 19:36:12 +09:00
5423e54649
Harcode project visibility
2017-11-05 01:39:36 +01:00
576f0a5a6d
Expose project visibility as CI variable
2017-11-04 04:46:29 +01:00
c6c9b37b1d
Add Clusters::Applications::Helm tests
2017-11-03 19:20:29 +01:00
3f0233e5b5
Create a Wiki Repository's raw_repository properly
2017-11-03 14:33:24 -03:00
e19f54ca41
Merge branch 'bvl-unlink-fixes' into 'master'
...
This fixes some bugs related to forked projects of which the source was deleted.
Closes #39667
See merge request gitlab-org/gitlab-ce!15150
2017-11-03 15:33:53 +00:00
cd88fa8f80
removed the #ensure_ref_fetched from all controllers
...
also, I refactored the MergeRequest#fetch_ref method to express
the side-effect that this method has.
MergeRequest#fetch_ref -> MergeRequest#fetch_ref!
Repository#fetch_source_branch -> Repository#fetch_source_branch!
2017-11-03 08:13:11 -04:00
6f1a4ba457
Add system hooks user_rename and group_rename
2017-11-03 11:26:52 +00:00
7582bc8b4e
Unlink a project from a fork network when it's source was deleted.
...
We need to close all merge requests coming from the project within the
entire fork network.
2017-11-03 12:17:59 +01:00
39d00bddc4
Make sure the settings page renders when root of a fork is deleted
2017-11-03 11:08:36 +01:00
1ca9aaf860
Merge branch 'refactor-clusters' into 38464-k8s-apps
2017-11-03 11:02:59 +01:00
694cfeb7b7
Merge branch 'master' into refactor-clusters
2017-11-03 04:43:55 -05:00
880cf60ba2
Merge branch 'master' into 38464-k8s-apps
2017-11-03 04:40:39 -05:00
1796683b86
Merge branch 'sh-fix-environment-slug-generation' into 'master'
...
Avoid regenerating the ref path for the environment
Closes #39752
See merge request gitlab-org/gitlab-ce!15167
2017-11-03 08:59:29 +00:00
1bbeafc3e1
Merge remote-tracking branch 'origin/master' into 38464-k8s-apps
2017-11-03 09:46:53 +01:00
600d5f4fba
Fix tests. Remove NOT NULL constraint from cluster.user.
2017-11-03 17:22:49 +09:00
6ebe6792de
Merge branch 'master' into refactor-clusters
2017-11-03 16:41:50 +09:00
0b18023c89
Avoid regenerating the ref path for the environment
...
Closes #39752
2017-11-02 15:35:12 -07:00
3602c0b987
Fix some tests
2017-11-03 03:37:32 +09:00
a8d7e4bcb1
Fix rubocop offenses
2017-11-02 17:08:56 +01:00
64be8d70ae
Improve backend structure of data
2017-11-02 15:10:46 +01:00
461c385ebc
Merge branch 'refactor-clusters' into 38464-k8s-apps
2017-11-02 14:01:30 +01:00
294fa6fcdc
Remove authentication using user.private_token
2017-11-02 11:39:02 +01:00
6950f38f83
Install k8s application with helm running inside the cluster
2017-11-02 11:14:39 +01:00
a41fb7b229
Merge branch 'master' into refactor-clusters
2017-11-02 16:12:41 +09:00
6571efb6c3
Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.
2017-11-01 16:12:44 +09:00
ef3ebed6d3
Merge branch 'master' into refactor-clusters
2017-11-01 15:42:57 +09:00
253bf69dda
specs for feature
2017-11-01 03:59:40 +09:00
Kamil Trzcinski
Alessio Caiazza
Shinya Maeda
Rémy Coutable
Grzegorz Bizon
Sean McGivern
micael.bergeron
Sean McGivern
Douwe Maan
Markus Koller
Matija Čupić
Alejandro Rodríguez
Douwe Maan
Winnie Hellmann
Bob Van Landuyt
Eric Eastwood
Stan Hu