summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump jira-ruby gem to 1.4.1 to fix issues with HTTP proxiesStan Hu2017-09-053-3/+9
| | | | | | | | Previous versions of jira-ruby gem would generate erroneous URLs when an HTTP proxy were confused via the `http_proxy` environment variables: https://github.com/sumoheavy/jira-ruby/issues/250 Closes gitlab-org/gitlab-ee#3125
* Merge branch '36821-fix-new-nav-wrapping-caret-and-increasing-height' into ↵Annabel Dunstone Gray2017-09-052-2/+7
|\ | | | | | | | | | | | | | | | | 'master' Fix new navigation wrapping caret and increasing height Closes #36821 See merge request !13967
| * Fix new nav wrapping caret and increasing height36821-fix-new-nav-wrapping-caret-and-increasing-heightEric Eastwood2017-08-312-2/+7
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/36821
* | Merge branch 'mr-index-page-performance' into 'master'Sean McGivern2017-09-0513-11/+244
|\ \ | | | | | | | | | | | | | | | | | | Re-use issue/MR counts for the pagination system Closes #27168 See merge request !13805
| * | Re-use issue/MR counts for the pagination systemmr-index-page-performanceYorick Peterse2017-09-0513-11/+244
| | | | | | | | | | | | | | | | | | | | | This changes the issue and MR index pages so the pagination system re-uses the output of the COUNT(*) query used to calculate the number of rows per state (opened, closed, etc). This removes the need for an additional COUNT(*) on both pages.
* | | Merge branch 'note-pull-code' into 'master'Rémy Coutable2017-09-051-23/+22
|\ \ \ | | | | | | | | | | | | | | | | Improve permission table on permissions.md See merge request !13179
| * | | Improve permission table on permissions.mdRaniere Silva2017-09-051-23/+22
|/ / /
* | | Merge branch 'update-gitignore-9-5' into 'master'Rémy Coutable2017-09-0511-48/+58
|\ \ \ | | | | | | | | | | | | | | | | update gitignores and licenses See merge request !13423
| * | | update gitignores and licenses - generated by bin/rake gitlab:update_templatesupdate-gitignore-9-5Simon Knox2017-08-0911-48/+58
| | | |
* | | | Merge branch 'docs/no-flaky' into 'master'Rémy Coutable2017-09-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix flaky-examples-test job to not run for docs See merge request !14039
| * | | | Fix flaky-examples-test job to not run for docsdocs/no-flakyAchilleas Pipinellis2017-09-041-1/+1
| | | | |
* | | | | Merge branch '37331-button-MR-widget' into 'master'Clement Ho2017-09-052-4/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix buttons with different height in merge request widget Closes #37331 See merge request !14000
| * | | | | Fix buttons with different height in merge request widget37331-button-MR-widgetFilipa Lacerda2017-09-012-4/+11
| | | | | |
* | | | | | Merge branch 'winh-ajax-users-dropdown' into 'master'Phil Hughes2017-09-051-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make .ajax-users-select dropdown consistent See merge request !13599
| * | | | | | Make .ajax-users-select dropdown consistentwinh-ajax-users-dropdownwinh2017-09-051-0/+1
| | | | | | |
* | | | | | | Merge branch 'po-lint-require' into 'master'Marin Jankovski2017-09-051-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not require the simple_po_parser in the gettext rake task when in a Closes #37379 See merge request !14044
| * | | | | | | Do not require the simple_po_parser in the gettext rake task when in aDJ Mountney2017-09-051-1/+2
|/ / / / / / /
* | | | | | | Merge branch 'winh-admin-group-role-dropdown' into 'master'Phil Hughes2017-09-051-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make role dropdown on group admin area consistent See merge request !14049
| * | | | | | | Make role dropdown on group admin area consistentwinh-admin-group-role-dropdownwinh2017-09-051-0/+1
| |/ / / / / /
* | | | | | | Merge branch 'winh-issuable-actions-dropdowns' into 'master'Phil Hughes2017-09-051-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make issuable action dropdowns style consistent See merge request !13455
| * | | | | | | Make issuable action dropdowns style consistentwinh-issuable-actions-dropdownswinh2017-09-051-0/+2
| | | | | | | |
* | | | | | | | Merge branch 'docs-add-assign-runner' into 'master'Achilleas Pipinellis2017-09-051-1/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Assigning a Runner to another project' Closes #35377 See merge request !13952
| * | | | | | | | Add 'Assigning a Runner to another project'Fabio Busatto2017-09-051-1/+18
|/ / / / / / / /
* | | | | | | | Merge branch '35010-projects-nav-dropdown' into 'master'Filipa Lacerda2017-09-0533-17/+1920
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dropdown to Projects nav item Closes #35010 See merge request !13866
| * | | | | | | | Add changelog entry35010-projects-nav-dropdownkushalpandya2017-09-051-0/+5
| | | | | | | | |
| * | | | | | | | Restore support for short-cut to Projects pagekushalpandya2017-09-051-1/+6
| | | | | | | | |
| * | | | | | | | Fix project metadata accessorkushalpandya2017-09-051-1/+2
| | | | | | | | |
| * | | | | | | | Add Projects Dropdown App i18n stringskushalpandya2017-09-051-2/+32
| | | | | | | | |
| * | | | | | | | Projects Dropdown Spec Mock Datakushalpandya2017-09-051-0/+96
| | | | | | | | |
| * | | | | | | | Projects Dropdown App Store Speckushalpandya2017-09-051-0/+41
| | | | | | | | |
| * | | | | | | | Projects Dropdown App Service Speckushalpandya2017-09-051-0/+178
| | | | | | | | |
| * | | | | | | | Projects Dropdown Frequent Projects Item Component Speckushalpandya2017-09-051-0/+65
| | | | | | | | |
| * | | | | | | | Projects Dropdown Searched Projects List Component Speckushalpandya2017-09-051-0/+84
| | | | | | | | |
| * | | | | | | | Projects Dropdown Frequent Projects List Component Speckushalpandya2017-09-051-0/+72
| | | | | | | | |
| * | | | | | | | Projects Dropdown Search Component Speckushalpandya2017-09-051-0/+101
| | | | | | | | |
| * | | | | | | | Projects Dropdown App Component Speckushalpandya2017-09-051-0/+348
| | | | | | | | |
| * | | | | | | | Add styles for Projects Dropdownkushalpandya2017-09-051-0/+149
| | | | | | | | |
| * | | | | | | | Add helper class for margin bottom `5px`kushalpandya2017-09-051-0/+1
| | | | | | | | |
| * | | | | | | | Move `common_vue` into vendor bundlekushalpandya2017-09-053-2/+2
| | | | | | | | |
| * | | | | | | | Add Projects Dropdown bundlekushalpandya2017-09-051-0/+1
| | | | | | | | |
| * | | | | | | | Projects Dropdown App Global Constantskushalpandya2017-09-051-0/+10
| | | | | | | | |
| * | | | | | | | Projects Dropdown Event Hubkushalpandya2017-09-051-0/+3
| | | | | | | | |
| * | | | | | | | Projects Dropdown App Storekushalpandya2017-09-051-0/+33
| | | | | | | | |
| * | | | | | | | Projects Dropdown App Servicekushalpandya2017-09-051-0/+132
| | | | | | | | |
| * | | | | | | | Projects Dropdown Searched Projects List Componentkushalpandya2017-09-051-0/+63
| | | | | | | | |
| * | | | | | | | Projects Dropdown Frequent Projects List Componentkushalpandya2017-09-051-0/+57
| | | | | | | | |
| * | | | | | | | Projects Dropdown Project Item Componentkushalpandya2017-09-051-0/+96
| | | | | | | | |
| * | | | | | | | Projects Dropdown Search Input Componentkushalpandya2017-09-051-0/+64
| | | | | | | | |
| * | | | | | | | Projects Dropdown Root App Componentkushalpandya2017-09-051-0/+157
| | | | | | | | |
| * | | | | | | | Projects Dropdown App Entrykushalpandya2017-09-051-0/+68
| | | | | | | | |
View Lorry Controller Status