summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix wording of nav togglenavigation-toggleAnnabel Dunstone Gray2017-07-122-2/+2
|
* 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
| * | | | | Update GITLAB_SHELL_VERSION to v5.3.0Kim Carlbäcker2017-07-091-1/+1
| | | | | |
| * | | | | need sha apparentlyKim "BKC" Carlbäcker2017-07-081-1/+1
| | | | | |
| * | | | | Update GitLab ShellKim "BKC" Carlbäcker2017-07-081-1/+1
| | | | | |
* | | | | | Merge branch '34729-blob' into 'master'Douwe Maan2017-07-112-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snippet has a blob, but isn't a blob Closes #34729 See merge request !12792
| * | | | | | snippet has a blob, but isn't a blob34729-blobSimon Knox2017-07-122-1/+5
| | | | | | |
* | | | | | | Merge branch '34867-remove-net-ssh-gem' into 'master'Rémy Coutable2017-07-113-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove net-ssh gem Closes #34867 See merge request !12736
| * | | | | | | Remove net-ssh gemTakuya Noguchi2017-07-093-3/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'sh-add-mr-simple-mode' into 'master'Sean McGivern2017-07-115-5/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a simple mode to merge request API Closes #34920 See merge request !12766
| * | | | | | | Use view=simple for simplifying merge requests APIStan Hu2017-07-113-5/+5
| | | | | | | |
| * | | | | | | Add a simple mode to merge request APIsh-add-mr-simple-modeStan Hu2017-07-115-5/+48
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current "basic" merge request API still loads too much data. For integrations like the Trello Power-up, we just need the basics. Closes #34920
* | | | | | | Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated vendor/licenses.csv for 9.4 See merge request !12788
| * | | | | | | Updated vendor/licenses.csv for 9.4James Edwards-Jones2017-07-111-260/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autogenerated using `bin/bundle exec license_finder report --format=csv --save=vendor/licenses.csv` Required license_finder 3.0.1 for https://github.com/pivotal/LicenseFinder/pull/304
* | | | | | | | Merge branch 'sh-bump-sidekiq' into 'master'Robert Speicher2017-07-111-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Sidekiq from 5.0.0 to 5.0.4 See merge request !12774
| * | | | | | | | Update Sidekiq from 5.0.0 to 5.0.4sh-bump-sidekiqStan Hu2017-07-101-1/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | See: https://github.com/mperham/sidekiq/blob/master/Changes.md
* | | | | | | | Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into ↵Kamil Trzciński2017-07-113-130/+169
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not show pipeline schedule button for non-member Closes #34907 See merge request !12757
| * | | | | | | Do not show pipeline schedule button for non-memberTakuya Noguchi2017-07-113-130/+169
| | | | | | | |
* | | | | | | | Merge branch 'sidebar-badge-fix-firefox' into 'master'Filipa Lacerda2017-07-111-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed badge alignment in new project sidebar in FireFox See merge request !12777
| * | | | | | | | Fixed badge alignment in new project sidebar in FireFoxsidebar-badge-fix-firefoxPhil Hughes2017-07-111-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jej/create-update-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-12/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 9.4 update instructions to include changes made to 9.3 instructions See merge request !12781
| * | | | | | | | 9.4 update instractions include changes made to 9.3 instructionsJames Edwards-Jones2017-07-111-12/+33
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-112-5/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't reload ActiveRecord objects when building note URLs Closes #34882 See merge request !12780
| * | | | | | | | | Don't reload ActiveRecord objects when building note URLsSean McGivern2017-07-112-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we build a note URL, and we have the note loaded already, there are two cases: 1. The `noteable` is already loaded. In that case, this is faster as it doesn't build a new AR object from the query. 2. The `noteable` is not already loaded. In that case, this change is no worse than the previous code.
* | | | | | | | | | Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update source installation instructions for 9.4 See merge request !12779
| * | | | | | | | | | Update source installation instructions for 9.4jej/update-source-install-instructions-for-9-4James Edwards-Jones2017-07-111-2/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jej/9-4-update-gitignore-and-license-templates' into 'master'Rémy Coutable2017-07-114-20/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CI templates for 9.4 See merge request !12784
| * | | | | | | | | Update CI templates for 9.4James Edwards-Jones2017-07-114-20/+25
| |/ / / / / / / /
View Lorry Controller Status