summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* Fix typofix-typoClement Ho2017-11-131-1/+1
|
* fix to allow integer label refernceshaseeb2017-11-131-1/+2
|
* Merge branch 'multi-editor-store-specs' into 'master'Filipa Lacerda2017-11-132-6/+6
|\ | | | | | | | | Added tests to multi-file Vuex store See merge request gitlab-org/gitlab-ce!15147
| * added missing specsmulti-editor-store-specsPhil Hughes2017-11-101-1/+1
| |
| * test updatesPhil Hughes2017-11-101-1/+1
| |
| * Added tests to multi-file Vuex storePhil Hughes2017-11-101-4/+4
| |
* | Export text utils as ES6 modulesFilipa Lacerda2017-11-1317-206/+227
| |
* | Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master'Tim Zallmann2017-11-121-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-openLuke "Jared" Bennett2017-11-071-3/+1
| | | | | | | | cause by only selecting elements for that dropdown instance
| * Run filter method for filterable gl_dropdown instancesLuke "Jared" Bennett2017-11-061-0/+2
| |
* | Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-101-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 Acet2017-11-091-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-isSubmittingLuke "Jared" Bennett2017-11-061-1/+2
| |/
* | Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann2017-11-091-4/+18
|\ \ | | | | | | | | | | | | | | | | | | Improve breadcrumbs clipping Closes #37920 See merge request gitlab-org/gitlab-ce!15164
| * | Dynamically truncate breadcrumbs37920-improve-breadcrumbs-clippingAnnabel Dunstone Gray2017-11-081-3/+14
| | |
| * | Remove max-width on desktopAnnabel Dunstone Gray2017-11-081-1/+4
| | |
* | | Enables scroll to bottom once user has scrolled back to bottom in job logFilipa Lacerda2017-11-091-26/+24
|/ /
* | Resolve "Merge request widget - CI information has different margins"Filipa Lacerda2017-11-084-92/+109
| |
* | Merge branch '37824-many-branches-lock-server' into 'master'Annabel Dunstone Gray2017-11-071-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 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-071-0/+4
| | |
| * | Update CSS to use flexbox for branch and tag labelskushalpandya2017-11-071-8/+8
| | |
| * | Address discussions on the MEMayra Cabrera2017-11-071-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 commentsMayra Cabrera2017-11-061-3/+2
| | | | | | | | | | | | | | | - Improves CSS files by reusing existing code - Changes logic in views to avoid future problems in translations
| * | Add styles for branch & tags boxesMayra Cabrera2017-11-021-0/+41
| | | | | | | | | | | | | | | - Create a partial for limit exceeded message - Modifies specs to adjust new scenarios
* | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-11-075-19/+10
|\ \ \ | | | | | | | | | | | | add-ingress-to-cluster-applications
| * \ \ Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński2017-11-0712-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 Ho2017-11-071-16/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Auto DevOps gear animation Closes #39798 See merge request gitlab-org/gitlab-ce!15232
| | * | | | Revert Autodevops gear animation39798-revert-gear-animationEric Eastwood2017-11-061-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39798
| * | | | | Merge branch 'multi-file-editor-table-cells-width' into 'master'Filipa Lacerda2017-11-074-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-widthPhil Hughes2017-11-074-3/+10
| | | | | | |
* | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Kamil Trzcinski2017-11-0715-79/+227
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | into add-ingress-to-cluster-applications
| * | | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0815-79/+227
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '38394-smarter-interval' into 'master'Filipa Lacerda2017-11-072-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 Knox2017-11-0763-396/+420
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval
| | | * | | | | update changelogSimon Knox2017-11-071-1/+1
| | | | | | | |
| | | * | | | | fix line lintSimon Knox2017-11-061-1/+2
| | | | | | | |
| | | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2017-11-06205-4610/+5974
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 38394-smarter-interval
| | | * | | | | | review feedback - throw error in smart_callback catch blockSimon Knox2017-11-021-2/+3
| | | | | | | | |
| | | * | | | | | update docstringSimon Knox2017-10-311-1/+1
| | | | | | | | |
| | | * | | | | | remove global export from SmartIntervalSimon Knox2017-10-312-4/+4
| | | | | | | | |
| | | * | | | | | don't re-run smart interval callback if there is already one in progressSimon Knox2017-10-242-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because some things take time
| | * | | | | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-0713-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-callPhil Hughes2017-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated controller based on review
| | | * | | | | | | moved key into data structurePhil Hughes2017-11-064-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses an array of classes to render skeleton loading cells
| | | * | | | | | | correctly updates commit data after committing changesPhil Hughes2017-11-069-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 viewPhil Hughes2017-11-062-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]