summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Update vue-resourceFilipa Lacerda2017-07-1228-170/+327
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'bugfix-htmlenc' into 'master'Sean McGivern2017-07-123-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decode user/namespace names before display See merge request !10085
| * | | | | | | | | | | | | | | | Stop sanitizing user 'name' when inserting into dbNathan Neulinger2017-07-123-1/+17
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec tests for encoding
* | | | | | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-07-121-4/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34792_add_traditional_chinese_in_taiwan_translations_of_pipeline_charts' into 'master' Add Traditional Chinese in Taiwan translations of Pipeline Charts Closes #34792 See merge request !12697
| * | | | | | | | | | | | | | | | Synchronous zanata in zh_TW translation黄涛2017-07-121-5/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | optimize translation content based on discussion黄涛2017-07-111-5/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | merge pipeline charts translate to gitlab.po黄涛2017-07-112-72/+56
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | optimize translation based on discussion黄涛2017-07-101-7/+7
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add zh-TW translation difference of Pipeline Charts黄涛2017-07-071-0/+70
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'replace_spinach_spec_browse_files' into 'master'Rémy Coutable2017-07-1213-380/+821
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'browse_files.feature' spinach test with an rspec analog See merge request !12251
| * | | | | | | | | | | | | | | Replace 'browse_files.feature' spinach test with an rspec analogblackst0ne2017-07-1213-380/+821
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '34325-reinstate-is_admin-for-user-api' into 'master'Sean McGivern2017-07-125-6/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return `is_admin` attribute in the GET /user endpoint for admins Closes #34325 See merge request !12811
| * | | | | | | | | | | | | | | Return `is_admin` attribute in the GET /user endpoint for adminsRémy Coutable2017-07-125-6/+53
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch '34978-remove-public-ci-favicon-ico' into 'master'Rémy Coutable2017-07-122-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove public/ci/favicon.ico Closes #34978 See merge request !12803
| * | | | | | | | | | | | | | | Remove public/ci/favicon.icoTakuya Noguchi2017-07-122-0/+4
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '34858-bump-scss-lint-to-0-54-0' into 'master'Rémy Coutable2017-07-124-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump scss-lint to 0.54.0 Closes #34858 See merge request !12733
| * | | | | | | | | | | | | | Bump scss-lint to 0.54.0Takuya Noguchi2017-07-084-5/+13
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'update-gitaly-0-17-0' into 'master'Rémy Coutable2017-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Gitaly server v0.17.0 Closes #34853 See merge request !12802
| * | | | | | | | | | | | | | Use Gitaly server v0.17.0update-gitaly-0-17-0Alejandro Rodríguez2017-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34853 and enables https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1712
* | | | | | | | | | | | | | | Merge branch 'new-nav-preferences-image' into 'master'Filipa Lacerda2017-07-121-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated new navigation image in preferences Closes #34970 See merge request !12806
| * | | | | | | | | | | | | | Updated new navigation image in preferencesPhil Hughes2017-07-121-0/+0
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34970
* | | | | | | | | | | | | | Merge branch 'remove-nprogress-gleaning' into 'master'Clement Ho2017-07-122-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CSS for nprogress removed See merge request !12737
| * | | | | | | | | | | | | | Remove CSS for nprogress removedTakuya Noguchi2017-07-122-6/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'enable-scss-lint-import-path' into 'master'Clement Ho2017-07-124-46/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable ImportPath in scss-lint See merge request !12749
| * | | | | | | | | | | | | | Enable ImportPath in scss-lintTakuya Noguchi2017-07-124-46/+50
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'enable-scss-lint-property-spelling' into 'master'Clement Ho2017-07-122-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable PropertySpelling in scss-lint See merge request !12752
| * | | | | | | | | | | | | Enable PropertySpelling in scss-lintTakuya Noguchi2017-07-122-1/+5
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'enable-scss-lint-space-after-comma' into 'master'Clement Ho2017-07-127-18/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable SpaceAfterComma in scss-lint See merge request !12734
| * | | | | | | | | | | | | Enable SpaceAfterComma in scss-lintTakuya Noguchi2017-07-127-18/+22
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'breadcrumbs-limit-width' into 'master'Annabel Dunstone Gray2017-07-114-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added limit-container-width to breadcrumbs container Closes #34573 See merge request !12776
| * | | | | | | | | | | | | Added limit-container-width to breadcrumbs containerbreadcrumbs-limit-widthPhil Hughes2017-07-114-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where the content has a limited width but the breadcrumbs remained full width. Instead of creating a new variable specifically for the breadcrumbs, it just re-uses @content_class Closes #34573
* | | | | | | | | | | | | | Merge branch 'rs-issue-34941' into 'master'Stan Hu2017-07-112-17/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilient Closes #34941 See merge request !12797
| * | | | | | | | | | | | | Make `Redis::Wrapper#_raw_config` and `#fetch_config` more resilientRobert Speicher2017-07-112-17/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two methods now handle two additional real-world possibilities: 1. `config/resque.yml` not being present 2. `config/resque.yml` being present but not containing YAML Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34941
* | | | | | | | | | | | | | Merge branch 'toggle-new-project-import-description' into 'master'Clement Ho2017-07-112-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle import description with import_sources_enabled Closes #34826 See merge request !12691
| * | | | | | | | | | | | | | Toggle import description with import_sources_enabledBrianna Kicia2017-07-112-2/+7
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Update CHANGELOG.md for 9.3.6kushalpandya2017-07-125-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | Merge branch '34796_add_esperanto_translations_of_pipeline_charts' into 'master'Douwe Maan2017-07-111-2/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Esperanto translations of Pipeline Charts Closes #34796 See merge request !12699
| * | | | | | | | | | | | | | merge pipeline charts translate to gitlab.po黄涛2017-07-112-75/+59
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add eo translation difference of Pipeline Charts黄涛2017-07-071-0/+73
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '34795_add_bulgarian_translations_of_pipeline_charts' into 'master'Douwe Maan2017-07-111-2/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Bulgarian translations of Pipeline Charts Closes #34795 See merge request !12698
| * | | | | | | | | | | | | | merge pipeline charts translate to gitlab.po黄涛2017-07-112-75/+59
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add bg translation difference of Pipeline Charts黄涛2017-07-071-0/+73
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch ↵Douwe Maan2017-07-111-5/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34791_add_traditional_chinese_in_hongkong_translations_of_pipeline_charts' into 'master' Add Traditional Chinese in HongKong translations of Pipeline Charts Closes #34791 See merge request !12696
| * | | | | | | | | | | | | | merge pipeline charts translate to gitlab.po黄涛2017-07-112-75/+57
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add zh-HK translation difference of Pipeline Charts黄涛2017-07-071-0/+70
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '34790_add_simplified_chinese_translations_of_pipeline_charts' ↵Douwe Maan2017-07-111-2/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add Simplified Chinese translations of Pipeline Charts Closes #34790 See merge request !12695
| * | | | | | | | | | | | | | merge pipeline charts translate to gitlab.po黄涛2017-07-112-72/+56
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | optimize translation based on discussion黄涛2017-07-101-5/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add zh-CN translation difference of Pipeline Charts黄涛2017-07-071-0/+70
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'update-gitlab-shell' into 'master'Stan Hu2017-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Shell to v5.3.0 See merge request !12730