Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2017-11-10Merge branch 'fix-502-mrs-with-lots-of-versions' into 'master'Yorick Peterse
Fix another timeout when searching for pipelines Closes #39054 See merge request gitlab-org/gitlab-ce!15322 (cherry picked from commit 0517b9e341a2960c54faa69717628225ed50c418) ec73ecb0 Fix another timeout when searching for pipelines
2017-11-10Merge branch '37920-improve-breadcrumbs-clipping' into 'master'Tim Zallmann
Improve breadcrumbs clipping Closes #37920 See merge request gitlab-org/gitlab-ce!15164 (cherry picked from commit 5d5d7f914c06a18dea567c8d90d0028fb3f86d07) cb2d2bc3 Remove max-width on desktop 738aec70 Dynamically truncate breadcrumbs
2017-11-10Merge branch 'tz-no-cdn-for-svg-sprites' into 'master'Douwe Maan
Icon Sprite URL needs to be local even if asset_host is set See merge request gitlab-org/gitlab-ce!15289 (cherry picked from commit e482a4d59dae6437a64ae4ccbe6976ffced7b9ba) 25eea058 Icon Sprite URL is also local even if asset_host is set 81eaf171 Fixed URL Matching in Tests 687e7dea Put Icons Path in Helper fb1b88de Missing the local url 01240a18 Fixed Function + Test based on MR fce34b4b Removed Brackets
2017-11-10Merge branch '39109-reenable-scroll-job' into 'master'Phil Hughes
Enables scroll to bottom once user has scrolled back to bottom in job log Closes #34846 and #39109 See merge request gitlab-org/gitlab-ce!15260 (cherry picked from commit a030a4a8daf5abd0ef6a3339666b38cdc688fff8) ce86fba0 Enables scroll to bottom once user has scrolled back to bottom in job log 62527afd Merge branch 'master' into 39109-reenable-scroll-job 0b5eda18 Improve naming and cache variables
2017-11-10Merge branch 'issue_39773_be' into 'master'Sean McGivern
Prevent fast forward merge when rebase is required Closes #39773 See merge request gitlab-org/gitlab-ce!15296 (cherry picked from commit f7537ce03a29b1af85461b2883c33bb41b2382d5) bddbb90f Prevent fast forward merge when rebase is required
2017-11-10Merge branch '32059-fix-oauth-phishing' into 'master'Douwe Maan
Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization See merge request gitlab-org/gitlab-ce!15311 (cherry picked from commit 8331786cfafd8c7c20daa154f0cc744a5ae5022f) ab1f3b47 Merge branch '32059-fix-oauth-phishing' into 'security-10-1' 24a3bee0 Add changelog entry for !2205
2017-11-10Merge branch 'sh-fix-lfs-write-deploy-keys' into 'master'Rémy Coutable
Fix Error 500 when pushing LFS objects with a write deploy key Closes #39467 See merge request gitlab-org/gitlab-ce!15039 (cherry picked from commit 07ab4ad60a894d60ac561f9fdbd641fac90b4acc)
2017-11-10Merge branch 'dm-notes-for-commit-id' into 'master'Rémy Coutable
Use Commit#notes and Note.for_commit_id when possible to make sure we use all indexes available to us Closes #34509 See merge request gitlab-org/gitlab-ce!15253 (cherry picked from commit bf13746fd8c7af1ef2e28e8a5a46cf0229b31eb8)
2017-11-10Merge branch '38395-mr-widget-ci' into 'master'Phil Hughes
Resolve "Merge request widget - CI information has different margins" Closes #38395 See merge request gitlab-org/gitlab-ce!15237 (cherry picked from commit baa64d590bd66f73a7afbfccd301a8a14f10513b)
2017-11-10Merge branch 'github-importer-refactor' into 'master'Douwe Maan
Rewrite the GitHub importer to perform work in parallel and greatly improve performance Closes #33135, #38621, and #39361 See merge request gitlab-org/gitlab-ce!14731 (cherry picked from commit 92249f1ac883c2a861235ec49526cbafca73b362)
2017-11-10Merge branch 'jivl-add-missing-strings-tag-page' into 'master'Tim Zallmann
Added missing strings to prepare the tags page for internationalization See merge request gitlab-org/gitlab-ce!15256 (cherry picked from commit 3c369ba16e5c5a7d8a9f6187e08cb504c1ad91a6)
2017-11-10Merge branch 'feature-change-signout-route' into 'master'Douwe Maan
Change Sign Out route from a DELETE to a GET Closes #39708 See merge request gitlab-org/gitlab-ce!15231 (cherry picked from commit b579cc7620dad1d406e974cce2d9ad5a4ce58a57)
2017-11-08Merge branch 'tc-delete-merged-protected-tags-fix' into 'master'Douwe Maan
When deleting merged branches, ignore protected tags Closes #39732 See merge request gitlab-org/gitlab-ce!15252
2017-11-08Merge branch '37824-many-branches-lock-server' into 'master'Annabel Dunstone Gray
Project with many branches can lock server running "git branch --contains XXX" Closes #37824 See merge request gitlab-org/gitlab-ce!14812
2017-11-08Remove truncate mixinAnnabel Dunstone Gray
2017-11-07Change cursor to pointer on hovertauriedavis
2017-11-07Simplify design for no tags, branchestauriedavis
2017-11-07Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
add-ingress-to-cluster-applications
2017-11-07Merge branch '38464-k8s-apps' into 'master'Kamil Trzciński
Add support for k8s cluster applications - Helm tiller installation See merge request gitlab-org/gitlab-ce!14908
2017-11-07Addresses frontend comments.Mayra Cabrera
Make small improvements over well.css files
2017-11-07Merge branch '39798-revert-gear-animation' into 'master'Clement Ho
Revert Auto DevOps gear animation Closes #39798 See merge request gitlab-org/gitlab-ce!15232
2017-11-07Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Kamil Trzcinski
into add-ingress-to-cluster-applications
2017-11-07Merge branch 'multi-file-editor-table-cells-width' into 'master'Filipa Lacerda
Fixed multi-file editor table cells content width jumping See merge request gitlab-org/gitlab-ce!15245
2017-11-07Make ingress to use install_commandKamil Trzcinski
2017-11-07Merge branch 'master' into 38464-k8s-appsShinya Maeda
2017-11-07Merge remote-tracking branch 'origin/38464-k8s-apps' into ↵Kamil Trzcinski
add-ingress-to-cluster-applications
2017-11-07Merge branch '39878-commit-pipeline-reads-wrong-key' into 'master'Tim Zallmann
Fix commit pipeline showing wrong status Closes #39878 See merge request gitlab-org/gitlab-ce!15238
2017-11-07Add Helm InstallCommandAlessio Caiazza
2017-11-07Merge branch '38394-smarter-interval' into 'master'Filipa Lacerda
don't re-run smart interval callback if there is already one in progress Closes #38394 See merge request gitlab-org/gitlab-ce!15032
2017-11-07When deleting merged branches, ignore protected tagsToon Claes
In gitlab-org/gitlab-ce!13251 wildcard Protected Branches were handled properly when deleting all merged branches. But this fix wasn't that good. It also checked branch names against Protected Tags. That's not correct. This change will **only** check if there is a Protected Branch matching the merged branch, and ignores Protected Tags. Closes gitlab-org/gitlab-ce#39732.
2017-11-07Fixed multi-file editor table cells content width jumpingPhil Hughes
2017-11-07Fix ingress.rbKamil Trzcinski
2017-11-07Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski
2017-11-07Fix tests for initial statusKamil Trzcinski
2017-11-07Refactor issuables index actionsJarka Kadlecova
2017-11-07Fix initial status againKamil Trzcinski
2017-11-07Fix initial status againKamil Trzcinski
2017-11-07Merge branch 'multi-file-editor-separate-commits-call' into 'master'Filipa Lacerda
Multi-file editor fetch log data from a different endpoint Closes #38360 See merge request gitlab-org/gitlab-ce!15132
2017-11-07Do not use %i() in state machinesAlessio Caiazza
2017-11-07Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce ↵Shinya Maeda
into 38464-k8s-apps
2017-11-07Fix initial_statusKamil Trzcinski
2017-11-07Merge branch '38464-k8s-apps' into add-ingress-to-cluster-applicationsKamil Trzcinski
2017-11-07Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'Kamil Trzciński
Make sure that every job has a stage assigned Closes #37979 See merge request gitlab-org/gitlab-ce!14724
2017-11-07Merge branch '39649-change-default-size-for-gke-cluster-creation' into 'master'Kamil Trzciński
Resolve "Change default size for GKE cluster creation" Closes #39649 See merge request gitlab-org/gitlab-ce!15220
2017-11-07Rework initial stateKamil Trzcinski
2017-11-07Ensure enough space between branch linksMayra Cabrera
2017-11-07Use flash for dismissable alertsEric Eastwood
2017-11-07Update Cluster application install to be enabled when erroredEric Eastwood
2017-11-07Merge branch 'master' into 38464-k8s-appsShinya Maeda
2017-11-07Resolve "Fix GKE wording"Fabio Busatto