summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-502-mrs-with-lots-of-versions' into 'master'Yorick Peterse2017-11-101-1/+13
* Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann2017-11-101-4/+18
* Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan2017-11-101-1/+8
* Merge branch '39109-reenable-scroll-job' into 'master'Phil Hughes2017-11-101-26/+24
* Merge branch 'issue_39773_be' into 'master'Sean McGivern2017-11-101-11/+16
* Merge branch '32059-fix-oauth-phishing' into 'master'Douwe Maan2017-11-104-6/+35
* Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master'Rémy Coutable2017-11-091-1/+2
* Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable2017-11-098-27/+8
* Merge branch '38395-mr-widget-ci' into 'master'Phil Hughes2017-11-094-92/+109
* Merge branch 'github-importer-refactor' into 'master'Douwe Maan2017-11-0923-15/+670
* Merge branch 'jivl-add-missing-strings-tag-page' into 'master'Tim Zallmann2017-11-091-3/+3
* Merge branch 'feature-change-signout-route' into 'master'Douwe Maan2017-11-091-1/+1
* Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan2017-11-081-1/+1
|\
| * When deleting merged branches, ignore protected tagstc-delete-merged-protected-tags-fixToon Claes2017-11-071-1/+1
* | Merge branch '37824-many-branches-lock-server' into 'master'Annabel Dunstone Gray2017-11-076-24/+81
|\ \
| * | 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-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
| * | Addresses front & backend commentsMayra Cabrera2017-11-063-7/+6
| * | Modifies commit branches sectionMayra Cabrera2017-11-063-9/+15
| * | Add styles for branch & tags boxesMayra Cabrera2017-11-025-19/+53
| * | Add UI/UX improvementsMayra Cabrera2017-11-012-14/+20
| * | optimize branching logicBrett Walker2017-10-171-6/+5
| * | implemented using an ivar, and added specsBrett Walker2017-10-132-7/+12
| * | moved throttling into the controller. if we hit the throttlingBrett Walker2017-10-124-26/+43
| * | if the branch/tag count is over a certain limit, don't executeBrett Walker2017-10-112-6/+6
* | | Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-appl...Kamil Trzcinski2017-11-076-21/+12
|\ \ \
| * \ \ Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński2017-11-0730-132/+970
| |\ \ \
| * \ \ \ Merge branch '39798-revert-gear-animation' into 'master'Clement Ho2017-11-072-18/+2
| |\ \ \ \
| | * | | | Revert Autodevops gear animation39798-revert-gear-animationEric Eastwood2017-11-062-18/+2
| * | | | | 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-0737-193/+373
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-0837-193/+373
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'Tim Zallmann2017-11-071-1/+1
| | |\ \ \ \
| | | * | | | Fix commit pipeline showing wrong status39878-commit-pipeline-reads-wrong-keyFilipa Lacerda2017-11-071-1/+1
| | * | | | | 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-07135-983/+1248
| | | |\ \ \ \ \
| | | * | | | | | 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-06404-5562/+8118
| | | |\ \ \ \ \ \
| | | * | | | | | | 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
| | * | | | | | | | Refactor issuables index actionsJarka Kadlecova2017-11-0713-101/+80
| | | |_|_|_|/ / / | | |/| | | | | |