Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Consider moving MergeRequestPresenter#ci_status logic to detailed CI/CD statusesfix/sm/31402-consider-moving-mergerequestpresenter-ci_status-logic-to-detailed-ci-cd-statuses | Shinya Maeda | 2017-11-08 | 1 | -4/+1 |
| | |||||
* | Merge branch 'jivl-fix-karma-config-file' into 'master' | Mike Greiling | 2017-11-08 | 1 | -9/+0 |
|\ | | | | | | | | | fix karma config file See merge request gitlab-org/gitlab-ce!15263 | ||||
| * | fix karma config filejivl-fix-karma-config-file | Jose Ivan Vargas | 2017-11-07 | 1 | -9/+0 |
| | | |||||
* | | Merge branch 'ux-guide-components-modal' into 'master' | Marcia Ramos | 2017-11-08 | 5 | -0/+33 |
|\ \ | | | | | | | | | | | | | Modals in UX guide See merge request gitlab-org/gitlab-ce!14886 | ||||
| * | | Changed the order of buttons from left to rightux-guide-components-modal | Hazel | 2017-11-06 | 1 | -1/+2 |
| | | | |||||
| * | | Modify the sentences and add Todo | Hazel | 2017-11-02 | 1 | -2/+4 |
| | | | |||||
| * | | Modified the font family in the images | Hazel | 2017-10-18 | 6 | -1/+1 |
| | | | |||||
| * | | Updated the sytle part - changed the order of header, body, and actions | Hazel | 2017-10-17 | 1 | -3/+3 |
| | | | |||||
| * | | Updated the content and added the images | Hazel | 2017-10-17 | 6 | -11/+12 |
| | | | |||||
| * | | Modified the copy | Hazel | 2017-10-16 | 1 | -1/+1 |
| | | | |||||
| * | | Draft a guide of modals in UX guide | Hazel | 2017-10-16 | 1 | -0/+29 |
| | | | |||||
* | | | Merge branch 'add-typescript' into 'master' | Stan Hu | 2017-11-08 | 5 | -140/+76 |
|\ \ \ | | | | | | | | | | | | | | | | | Adds typescript support in webpack. With Mike G. See merge request gitlab-org/gitlab-ce!15264 | ||||
| * | | | Remove comments in JSON. | Jacob Schatz | 2017-11-07 | 1 | -3/+0 |
| | | | | |||||
| * | | | Add changelog | Jacob Schatz | 2017-11-07 | 1 | -0/+5 |
| | | | | |||||
| * | | | Adds typescript support in webpack. With Mike G. | Jacob Schatz | 2017-11-07 | 4 | -140/+74 |
| | | | | |||||
* | | | | Merge branch 'docs-add-glcom-reg-restictions' into 'master' | Marcia Ramos | 2017-11-07 | 1 | -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.com | Chenjerai Katanda | 2017-11-07 | 1 | -1/+2 |
|/ / / | |||||
* | | | Merge branch '37824-many-branches-lock-server' into 'master' | Annabel Dunstone Gray | 2017-11-07 | 9 | -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 mixin | Annabel Dunstone Gray | 2017-11-07 | 1 | -1/+0 |
| | | | |||||
| * | | Change cursor to pointer on hover | tauriedavis | 2017-11-07 | 1 | -0/+1 |
| | | | |||||
| * | | Simplify design for no tags, branches | tauriedavis | 2017-11-07 | 1 | -17/+4 |
| | | | |||||
| * | | Addresses frontend comments.37824-many-branches-lock-server | Mayra Cabrera | 2017-11-07 | 1 | -6/+6 |
| | | | | | | | | | | | | Make small improvements over well.css files | ||||
| * | | Ensure enough space between branch links | Mayra Cabrera | 2017-11-07 | 2 | -1/+5 |
| | | | |||||
| * | | Update CSS to use flexbox for branch and tag labels | kushalpandya | 2017-11-07 | 1 | -8/+8 |
| | | | |||||
| * | | Address discussions on the ME | Mayra Cabrera | 2017-11-07 | 3 | -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 comments | Mayra Cabrera | 2017-11-06 | 4 | -8/+7 |
| | | | | | | | | | | | | | | | - Improves CSS files by reusing existing code - Changes logic in views to avoid future problems in translations | ||||
| * | | Modifies commit branches section | Mayra Cabrera | 2017-11-06 | 4 | -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 boxes | Mayra Cabrera | 2017-11-02 | 6 | -23/+55 |
| | | | | | | | | | | | | | | | - Create a partial for limit exceeded message - Modifies specs to adjust new scenarios | ||||
| * | | Add UI/UX improvements | Mayra Cabrera | 2017-11-01 | 2 | -14/+20 |
| | | | | | | | | | | | | | | | - Leave 'too many tags to search' always visible - Add different message to the branch/tags so it states its unavailable | ||||
| * | | added changelog entry | Brett Walker | 2017-10-19 | 1 | -0/+6 |
| | | | |||||
| * | | optimize branching logic | Brett Walker | 2017-10-17 | 1 | -6/+5 |
| | | | |||||
| * | | implemented using an ivar, and added specs | Brett Walker | 2017-10-13 | 4 | -11/+78 |
| | | | |||||
| * | | moved throttling into the controller. if we hit the throttling | Brett Walker | 2017-10-12 | 4 | -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 execute | Brett Walker | 2017-10-11 | 2 | -6/+6 |
| | | | | | | | | | | | | the long running git query | ||||
* | | | Merge branch 'add-ingress-to-cluster-applications' into 'master' | Kamil Trzciński | 2017-11-07 | 14 | -23/+325 |
|\ \ \ | | | | | | | | | | | | | | | | | Add Ingress to cluster applications section See merge request gitlab-org/gitlab-ce!15185 | ||||
| * \ \ | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-11-07 | 7 | -26/+12 |
| |\ \ \ | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications | ||||
| * | | | | Fix db/schema.rb | Kamil Trzcinski | 2017-11-07 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Add feature spec for Ingress | Eric Eastwood | 2017-11-07 | 1 | -16/+60 |
| | | | | | |||||
| * | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2017-11-07 | 68 | -442/+766 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into add-ingress-to-cluster-applications | ||||
| * \ \ \ \ | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2017-11-07 | 1 | -3/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into add-ingress-to-cluster-applications | ||||
| * | | | | | | Make ingress to use install_command | Kamil Trzcinski | 2017-11-07 | 2 | -2/+22 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/38464-k8s-apps' into ↵ | Kamil Trzcinski | 2017-11-07 | 12 | -45/+208 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | add-ingress-to-cluster-applications | ||||
| * | | | | | | | Fix ingress rubocop failure | Kamil Trzcinski | 2017-11-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add specs for ingress | Kamil Trzcinski | 2017-11-07 | 3 | -0/+148 |
| | | | | | | | | |||||
| * | | | | | | | Fix ingress.rb | Kamil Trzcinski | 2017-11-07 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Kamil Trzcinski | 2017-11-07 | 95 | -221/+815 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix initial status again | Kamil Trzcinski | 2017-11-07 | 3 | -13/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix initial_status | Kamil Trzcinski | 2017-11-07 | 1 | -4/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Kamil Trzcinski | 2017-11-07 | 29 | -209/+157 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applications | Eric Eastwood | 2017-11-06 | 237 | -2946/+8139 |
| |\ \ \ \ \ \ \ \ \ |