summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '32059-fix-oauth-phishing' into 'security-10-1'Douwe Maan2017-11-101-0/+19
* Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master'Fatih Acet2017-11-091-1/+2
|\
| * 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
|\ \
| * | 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
|\ \
| * | 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
| * | 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
| * | Addresses front & backend commentsMayra Cabrera2017-11-061-3/+2
| * | Add styles for branch & tags boxesMayra Cabrera2017-11-021-0/+41
* | | Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-appl...Kamil Trzcinski2017-11-075-19/+10
|\ \ \
| * \ \ Merge branch '38464-k8s-apps' into 'master'Kamil TrzciƄski2017-11-0712-126/+637
| |\ \ \
| * \ \ \ Merge branch '39798-revert-gear-animation' into 'master'Clement Ho2017-11-071-16/+0
| |\ \ \ \
| | * | | | Revert Autodevops gear animation39798-revert-gear-animationEric Eastwood2017-11-061-16/+0
| * | | | | Merge branch 'multi-file-editor-table-cells-width' into 'master'Filipa Lacerda2017-11-074-3/+10
| |\ \ \ \ \
| | * | | | | 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 into...Kamil Trzcinski2017-11-0715-79/+227
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 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
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 38394-smarter-i...Simon Knox2017-11-0763-396/+420
| | | |\ \ \ \
| | | * | | | | 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 38394-smarter-i...Simon Knox2017-11-06205-4610/+5974
| | | |\ \ \ \ \
| | | * | | | | | 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
| | * | | | | | | Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda2017-11-0713-68/+200
| | |\ \ \ \ \ \ \
| | | * | | | | | | fixed karma testmulti-file-editor-separate-commits-callPhil Hughes2017-11-061-1/+1
| | | * | | | | | | moved key into data structurePhil Hughes2017-11-064-5/+12
| | | * | | | | | | correctly updates commit data after committing changesPhil Hughes2017-11-069-79/+126
| | | * | | | | | | only allow the call when not in collapsed viewPhil Hughes2017-11-062-2/+4
| | | * | | | | | | Multi-file editor fetch log data from a different endpointPhil Hughes2017-11-069-17/+93
| | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski2017-11-0718-97/+233
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-072-5/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0718-97/+233
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '2518-saved-configuration-for-issue-board' into 'master'Sean McGivern2017-11-0713-65/+163
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | appease lint2518-saved-configuration-for-issue-boardSimon Knox2017-11-071-3/+1
| | | * | | | | | | unused propSimon Knox2017-11-061-7/+1
| | | * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-0664-943/+1091
| | | |\ \ \ \ \ \ \ | | | | | |_|_|/ / / | | | | |/| | | | |
| | | * | | | | | | fix bad master mergeSimon Knox2017-11-021-4/+4
| | | * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 2518-saved-conf...Simon Knox2017-11-0168-1882/+2036
| | | |\ \ \ \ \ \ \