Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix typofix-typo | Clement Ho | 2017-11-13 | 1 | -1/+1 |
| | |||||
* | fix to allow integer label refernces | haseeb | 2017-11-13 | 1 | -1/+2 |
| | |||||
* | Merge branch 'multi-editor-store-specs' into 'master' | Filipa Lacerda | 2017-11-13 | 2 | -6/+6 |
|\ | | | | | | | | | Added tests to multi-file Vuex store See merge request gitlab-org/gitlab-ce!15147 | ||||
| * | added missing specsmulti-editor-store-specs | Phil Hughes | 2017-11-10 | 1 | -1/+1 |
| | | |||||
| * | test updates | Phil Hughes | 2017-11-10 | 1 | -1/+1 |
| | | |||||
| * | Added tests to multi-file Vuex store | Phil Hughes | 2017-11-10 | 1 | -4/+4 |
| | | |||||
* | | Export text utils as ES6 modules | Filipa Lacerda | 2017-11-13 | 17 | -206/+227 |
| | | |||||
* | | Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master' | Tim Zallmann | 2017-11-12 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | Clear filter on gl_dropdown open Closes #39564 See merge request gitlab-org/gitlab-ce!15214 | ||||
| * | Change fix, instead of hacking in a filter clear every time, fix the root ↵39564-clear-filter-on-gitlab-dropdown-open | Luke "Jared" Bennett | 2017-11-07 | 1 | -3/+1 |
| | | | | | | | | cause by only selecting elements for that dropdown instance | ||||
| * | Run filter method for filterable gl_dropdown instances | Luke "Jared" Bennett | 2017-11-06 | 1 | -0/+2 |
| | | |||||
* | | Merge branch '32059-fix-oauth-phishing' into 'security-10-1' | Douwe Maan | 2017-11-10 | 1 | -0/+19 |
| | | | | | | | | | | | | Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab/gitlabhq!2205 | ||||
* | | Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master' | Fatih Acet | 2017-11-09 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | Disable issue action button whilst submitting and test See merge request gitlab-org/gitlab-ce!15211 | ||||
| * | | Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmitting | Luke "Jared" Bennett | 2017-11-06 | 1 | -1/+2 |
| |/ | |||||
* | | Merge branch '37920-improve-breadcrumbs-clipping' into 'master' | Tim Zallmann | 2017-11-09 | 1 | -4/+18 |
|\ \ | | | | | | | | | | | | | | | | | | | Improve breadcrumbs clipping Closes #37920 See merge request gitlab-org/gitlab-ce!15164 | ||||
| * | | Dynamically truncate breadcrumbs37920-improve-breadcrumbs-clipping | Annabel Dunstone Gray | 2017-11-08 | 1 | -3/+14 |
| | | | |||||
| * | | Remove max-width on desktop | Annabel Dunstone Gray | 2017-11-08 | 1 | -1/+4 |
| | | | |||||
* | | | Enables scroll to bottom once user has scrolled back to bottom in job log | Filipa Lacerda | 2017-11-09 | 1 | -26/+24 |
|/ / | |||||
* | | Resolve "Merge request widget - CI information has different margins" | Filipa Lacerda | 2017-11-08 | 4 | -92/+109 |
| | | |||||
* | | Merge branch '37824-many-branches-lock-server' into 'master' | Annabel Dunstone Gray | 2017-11-07 | 1 | -0/+31 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+4 |
| | | | |||||
| * | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | - 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 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | - Improves CSS files by reusing existing code - Changes logic in views to avoid future problems in translations | ||||
| * | | Add styles for branch & tags boxes | Mayra Cabrera | 2017-11-02 | 1 | -0/+41 |
| | | | | | | | | | | | | | | | - Create a partial for limit exceeded message - Modifies specs to adjust new scenarios | ||||
* | | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-11-07 | 5 | -19/+10 |
|\ \ \ | | | | | | | | | | | | | add-ingress-to-cluster-applications | ||||
| * \ \ | Merge branch '38464-k8s-apps' into 'master' | Kamil Trzciński | 2017-11-07 | 12 | -126/+637 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add support for k8s cluster applications - Helm tiller installation See merge request gitlab-org/gitlab-ce!14908 | ||||
| * \ \ \ | Merge branch '39798-revert-gear-animation' into 'master' | Clement Ho | 2017-11-07 | 1 | -16/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Auto DevOps gear animation Closes #39798 See merge request gitlab-org/gitlab-ce!15232 | ||||
| | * | | | | Revert Autodevops gear animation39798-revert-gear-animation | Eric Eastwood | 2017-11-06 | 1 | -16/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39798 | ||||
| * | | | | | Merge branch 'multi-file-editor-table-cells-width' into 'master' | Filipa Lacerda | 2017-11-07 | 4 | -3/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed multi-file editor table cells content width jumping See merge request gitlab-org/gitlab-ce!15245 | ||||
| | * | | | | | Fixed multi-file editor table cells content width jumpingmulti-file-editor-table-cells-width | Phil Hughes | 2017-11-07 | 4 | -3/+10 |
| | | | | | | | |||||
* | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2017-11-07 | 15 | -79/+227 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | into add-ingress-to-cluster-applications | ||||
| * | | | | | | Merge branch 'master' into 38464-k8s-apps | Shinya Maeda | 2017-11-08 | 15 | -79/+227 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '38394-smarter-interval' into 'master' | Filipa Lacerda | 2017-11-07 | 2 | -11/+27 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't re-run smart interval callback if there is already one in progress Closes #38394 See merge request gitlab-org/gitlab-ce!15032 | ||||
| | | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-11-07 | 63 | -396/+420 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval | ||||
| | | * | | | | | update changelog | Simon Knox | 2017-11-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | fix line lint | Simon Knox | 2017-11-06 | 1 | -1/+2 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2017-11-06 | 205 | -4610/+5974 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval | ||||
| | | * | | | | | | review feedback - throw error in smart_callback catch block | Simon Knox | 2017-11-02 | 1 | -2/+3 |
| | | | | | | | | | |||||
| | | * | | | | | | update docstring | Simon Knox | 2017-10-31 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | remove global export from SmartInterval | Simon Knox | 2017-10-31 | 2 | -4/+4 |
| | | | | | | | | | |||||
| | | * | | | | | | don't re-run smart interval callback if there is already one in progress | Simon Knox | 2017-10-24 | 2 | -6/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because some things take time | ||||
| | * | | | | | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master' | Filipa Lacerda | 2017-11-07 | 13 | -68/+200 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-file editor fetch log data from a different endpoint Closes #38360 See merge request gitlab-org/gitlab-ce!15132 | ||||
| | | * | | | | | | | fixed karma testmulti-file-editor-separate-commits-call | Phil Hughes | 2017-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated controller based on review | ||||
| | | * | | | | | | | moved key into data structure | Phil Hughes | 2017-11-06 | 4 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses an array of classes to render skeleton loading cells | ||||
| | | * | | | | | | | correctly updates commit data after committing changes | Phil Hughes | 2017-11-06 | 9 | -79/+126 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also merges data in after a fetch to save overriting all data. changed the render keys to save a full re-render when any data changes | ||||
| | | * | | | | | | | only allow the call when not in collapsed view | Phil Hughes | 2017-11-06 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] |