Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix specsfix/import-export-arguments | James Lopez | 2017-11-07 | 1 | -3/+3 |
| | |||||
* | Fix arguments error on Import/Export fetch_ref method | James Lopez | 2017-11-07 | 2 | -1/+11 |
| | | | | Added unit test and updated integration spec to test for this as well. | ||||
* | Merge branch ↵ | Rémy Coutable | 2017-11-07 | 1 | -0/+13 |
|\ | | | | | | | | | | | | | | | | | '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 | ||||
| * | Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue | Sean McGivern | 2017-11-06 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master' | Rémy Coutable | 2017-11-07 | 15 | -4/+108 |
|\ \ | | | | | | | | | | | | | Support custom attributes on groups and projects See merge request gitlab-org/gitlab-ce!14593 | ||||
| * | | Support custom attributes on groups | Markus Koller | 2017-11-06 | 4 | -0/+34 |
| | | | |||||
| * | | Support custom attributes on projects | Markus Koller | 2017-11-06 | 11 | -4/+74 |
| | | | |||||
* | | | Merge branch 'add-changes-count-to-merge-requests-api' into 'master' | Rémy Coutable | 2017-11-07 | 2 | -12/+23 |
|\ \ \ | | | | | | | | | | | | | | | | | Add changes_count to the merge requests API See merge request gitlab-org/gitlab-ce!15178 | ||||
| * | | | Add changes_count to the merge requests APIadd-changes-count-to-merge-requests-api | Sean McGivern | 2017-11-03 | 2 | -12/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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+`. | ||||
* | | | | Merge branch '35616-move-gke-form-1st-iteration' into 'master' | Grzegorz Bizon | 2017-11-07 | 2 | -4/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | First iteration of Move Kubernetes from service to Cluster page See merge request gitlab-org/gitlab-ce!15061 | ||||
| * | | | | Fix spec35616-move-gke-form-1st-iteration | Shinya Maeda | 2017-11-07 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-11-06 | 68 | -772/+959 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | 35616-move-gke-form-1st-iteration | ||||
| * \ \ \ \ | Merge remote-tracking branch ↵ | Kamil Trzcinski | 2017-11-06 | 352 | -3702/+6820 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 'origin/move-kubernetes-from-service-to-clusters-page-10-2-ver' into 35616-move-gke-form-1st-iteration | ||||
| | * \ \ \ \ | Merge branch 'refactor-clusters' into ↵move-kubernetes-from-service-to-clusters-page-10-2-ver | Shinya Maeda | 2017-11-06 | 6 | -25/+162 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver | ||||
| | * \ \ \ \ \ | Merge branch 'refactor-clusters' into ↵ | Shinya Maeda | 2017-11-05 | 139 | -392/+732 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver | ||||
| | * | | | | | | | Fixed controller spec | Shinya Maeda | 2017-11-04 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch '35616-move-gke-form-1st-iteration' into ↵ | Shinya Maeda | 2017-11-04 | 2 | -3/+7 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move-kubernetes-from-service-to-clusters-page-10-2-ver | ||||
| * | | | | | | | | | Workaround today the failure in tests | Kamil Trzcinski | 2017-11-03 | 1 | -1/+2 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Fix static anlysys | Shinya Maeda | 2017-11-02 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix pipeline. Fix routing when validation failed. | Shinya Maeda | 2017-11-01 | 2 | -4/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'bugfix_banzai_closed_milestones' into 'master' | Sean McGivern | 2017-11-07 | 1 | -4/+30 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GFM reference links for closed milestones Closes #39850 See merge request gitlab-org/gitlab-ce!15234 | ||||
| * | | | | | | | | | Fix GFM reference links for closed milestonesbugfix_banzai_closed_milestones | Vitaliy @blackst0ne Klachkov | 2017-11-07 | 1 | -4/+30 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'feature_change_sort_refs' into 'master' | Douwe Maan | 2017-11-07 | 1 | -5/+6 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change tags order in refs dropdown Closes #37336 See merge request gitlab-org/gitlab-ce!15235 | ||||
| * | | | | | | | | | | Change tags order in refs dropdownfeature_change_sort_refs | Vitaliy @blackst0ne Klachkov | 2017-11-07 | 1 | -5/+6 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'multiple-query-prometheus-graphs' into 'master' | Tim Zallmann | 2017-11-07 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable multiple queries per Prometheus graph See merge request gitlab-org/gitlab-ce!15201 | ||||
| * | | | | | | | | | fix karma failures | Mike Greiling | 2017-11-06 | 3 | -3/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'es-module-copy_as_gfm' into 'master' | Filipa Lacerda | 2017-11-06 | 4 | -52/+52 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert copy_as_gfm into ES module and move to behaviors See merge request gitlab-org/gitlab-ce!14859 | ||||
| * | | | | | | | | | | fix broken module import | Mike Greiling | 2017-11-01 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | remove global export except in test environments | Mike Greiling | 2017-11-01 | 3 | -51/+49 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch '20666-404-error-issue-assigned-with-issues-disabled' into 'master' | Clement Ho | 2017-11-06 | 2 | -8/+23 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when issues are disabled Closes #20666 See merge request gitlab-org/gitlab-ce!15021 | ||||
| * | | | | | | | | | | Fixes 404 error to `Issues assigned to me` and `Issues I've created` when ↵ | Jacopo | 2017-11-06 | 2 | -8/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues are disabled The dropdown options `Issues assigned to me` and `Issues I've created` in project search are now hidden when issues are disabled on the project. | ||||
* | | | | | | | | | | | Merge branch 'refactor-clusters' into 'master' | Grzegorz Bizon | 2017-11-06 | 38 | -894/+1903 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Clusters to be consisted from GcpProvider and KubernetesPlatform See merge request gitlab-org/gitlab-ce!14879 | ||||
| * | | | | | | | | | | | Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory ↵refactor-clusters | Shinya Maeda | 2017-11-06 | 15 | -206/+36 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name. Use ArgumentError | ||||
| * | | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-06 | 6 | -25/+162 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-05 | 139 | -392/+732 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Move migration file to post-migration. Use EachBatch. batch_size 1 | Shinya Maeda | 2017-11-04 | 1 | -13/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix MigrateGcpClustersToNewClustersArchitectures. Improve spec | Shinya Maeda | 2017-11-03 | 1 | -76/+164 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix import_export failure | Shinya Maeda | 2017-11-03 | 1 | -3/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fix spec failure. MySQL does not bite true | Shinya Maeda | 2017-11-03 | 3 | -2/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into refactor-clusters | Eric Eastwood | 2017-11-03 | 2 | -0/+28 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix tests. Remove NOT NULL constraint from cluster.user. | Shinya Maeda | 2017-11-03 | 3 | -6/+11 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-03 | 88 | -860/+1091 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix some tests | Shinya Maeda | 2017-11-03 | 7 | -285/+183 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix out of sync with KubernetesService. Remove namespace pramas from ↵ | Shinya Maeda | 2017-11-02 | 1 | -26/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller. Use time_with_zone in schema. Remove Gcp::Clusters from safe_model_attributes.ym | ||||
| * | | | | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-02 | 14 | -135/+439 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Revert back FetchKubernetesTokenService | Kamil Trzcinski | 2017-11-01 | 1 | -0/+64 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Improve migration file. Add migration spec. Reorder columns of the table. | Shinya Maeda | 2017-11-01 | 1 | -0/+88 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes. | Shinya Maeda | 2017-11-01 | 7 | -36/+84 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into refactor-clusters | Shinya Maeda | 2017-11-01 | 310 | -4063/+6480 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | specs for feature | Shinya Maeda | 2017-11-01 | 5 | -80/+155 |
| | | | | | | | | | | | | | | |