summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added file storage documentation and updated hash storage oneupdate-upload-documentationGabriel Mazetto2017-11-082-10/+58
|
* Merge branch 'add-typescript' into 'master'Stan Hu2017-11-085-140/+76
|\ | | | | | | | | Adds typescript support in webpack. With Mike G. See merge request gitlab-org/gitlab-ce!15264
| * Remove comments in JSON.Jacob Schatz2017-11-071-3/+0
| |
| * Add changelogJacob Schatz2017-11-071-0/+5
| |
| * Adds typescript support in webpack. With Mike G.Jacob Schatz2017-11-074-140/+74
| |
* | Merge branch 'docs-add-glcom-reg-restictions' into 'master'Marcia Ramos2017-11-071-1/+2
|\ \ | |/ |/| | | | | Add note on registry restrictions on GitLab.com See merge request gitlab-org/gitlab-ce!15174
| * Add note on registry restrictions on GitLab.comChenjerai Katanda2017-11-071-1/+2
|/
* Merge branch '37824-many-branches-lock-server' into 'master'Annabel Dunstone Gray2017-11-079-28/+218
|\ | | | | | | | | | | | | Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812
| * Remove truncate mixinAnnabel Dunstone Gray2017-11-071-1/+0
| |
| * Change cursor to pointer on hovertauriedavis2017-11-071-0/+1
| |
| * Simplify design for no tags, branchestauriedavis2017-11-071-17/+4
| |
| * Addresses frontend comments.37824-many-branches-lock-serverMayra Cabrera2017-11-071-6/+6
| | | | | | | | Make small improvements over well.css files
| * Ensure enough space between branch linksMayra Cabrera2017-11-072-1/+5
| |
| * Update CSS to use flexbox for branch and tag labelskushalpandya2017-11-071-8/+8
| |
| * Address discussions on the MEMayra Cabrera2017-11-073-7/+7
| | | | | | | | | | | | - Fixes thinner right border on the limit box - Adds and 'elsif' on @branches for the scenario in which a commit is not related to a branch - Fixes small details on limit_exceeded_for_message partial
| * Addresses front & backend commentsMayra Cabrera2017-11-064-8/+7
| | | | | | | | | | - Improves CSS files by reusing existing code - Changes logic in views to avoid future problems in translations
| * Modifies commit branches sectionMayra Cabrera2017-11-064-12/+85
| | | | | | | | | | | | - Display the default branch (if the limit is not exceeded) - Requires '...' to be clicked before showing the rest of the branches and/or tags - Fixes haml lints
| * Add styles for branch & tags boxesMayra Cabrera2017-11-026-23/+55
| | | | | | | | | | - Create a partial for limit exceeded message - Modifies specs to adjust new scenarios
| * Add UI/UX improvementsMayra Cabrera2017-11-012-14/+20
| | | | | | | | | | - Leave 'too many tags to search' always visible - Add different message to the branch/tags so it states its unavailable
| * added changelog entryBrett Walker2017-10-191-0/+6
| |
| * optimize branching logicBrett Walker2017-10-171-6/+5
| |
| * implemented using an ivar, and added specsBrett Walker2017-10-134-11/+78
| |
| * moved throttling into the controller. if we hit the throttlingBrett Walker2017-10-124-26/+43
| | | | | | | | threshhold, a message is shown indicating we didn't perform the search
| * if the branch/tag count is over a certain limit, don't executeBrett Walker2017-10-112-6/+6
| | | | | | | | the long running git query
* | Merge branch 'add-ingress-to-cluster-applications' into 'master'Kamil Trzciński2017-11-0714-23/+325
|\ \ | | | | | | | | | | | | Add Ingress to cluster applications section See merge request gitlab-org/gitlab-ce!15185
| * \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-11-077-26/+12
| |\ \ | | | | | | | | | | | | add-ingress-to-cluster-applications
| * | | Fix db/schema.rbKamil Trzcinski2017-11-071-2/+1
| | | |
| * | | Add feature spec for IngressEric Eastwood2017-11-071-16/+60
| | | |
| * | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Kamil Trzcinski2017-11-0768-442/+766
| |\ \ \ | | | | | | | | | | | | | | | into add-ingress-to-cluster-applications
| * \ \ \ Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Kamil Trzcinski2017-11-071-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into add-ingress-to-cluster-applications
| * | | | | Make ingress to use install_commandKamil Trzcinski2017-11-072-2/+22
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/38464-k8s-apps' into ↵Kamil Trzcinski2017-11-0712-45/+208
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications
| * | | | | | Fix ingress rubocop failureKamil Trzcinski2017-11-071-1/+1
| | | | | | |
| * | | | | | Add specs for ingressKamil Trzcinski2017-11-073-0/+148
| | | | | | |
| * | | | | | Fix ingress.rbKamil Trzcinski2017-11-071-0/+2
| | | | | | |
| * | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-0795-221/+815
| |\ \ \ \ \ \
| * | | | | | | Fix initial status againKamil Trzcinski2017-11-073-13/+9
| | | | | | | |
| * | | | | | | Fix initial_statusKamil Trzcinski2017-11-071-4/+6
| | | | | | | |
| * | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-0729-209/+157
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-06237-2946/+8139
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-062-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add changelog for Ingress in Cluster applicationsEric Eastwood2017-11-061-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'add-ingress-to-cluster-applications' of ↵Eric Eastwood2017-11-061-1/+10
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into add-ingress-to-cluster-applications
| | * | | | | | | | | | Fix db/schema.rbKamil Trzcinski2017-11-061-1/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Remove misspelled duplicate endpointEric Eastwood2017-11-061-1/+0
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsEric Eastwood2017-11-0656-374/+668
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '36629-35958-add-cluster-application-section' into ↵add-ingress-to-cluster-applicationsEric Eastwood2017-11-062-10/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '36629-35958-add-cluster-application-section' into ↵Eric Eastwood2017-11-067-34/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications Conflicts: app/assets/javascripts/clusters/clusters_bundle.js app/assets/javascripts/clusters/components/application_row.vue app/assets/javascripts/clusters/services/clusters_service.js
| * | | | | | | | | | | | | Add active? to Platforms::KubernetesKamil Trzcinski2017-11-061-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add support for not_installable/scheduled and to not show created bannerKamil Trzcinski2017-11-067-5/+27
| | | | | | | | | | | | | |
View Lorry Controller Status