summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch '35483-improve-mobile-sidebar' into 'master'Phil Hughes2017-08-077-42/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve mobile sidebar Closes #35483 See merge request !13349
| * | | | | | | | | | Improve mobile sidebarAnnabel Dunstone Gray2017-08-077-42/+31
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-0716-3761/+139
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove jQuery Nicescroll" Closes #15664, #30860, and #35885 See merge request !13262
| * | | | | | | | | | remove sidebar height management from wikis sidebarMike Greiling2017-08-071-1/+0
| | | | | | | | | | |
| * | | | | | | | | | fix failing specs due phantomJS scroll positionMike Greiling2017-08-041-4/+4
| | | | | | | | | | |
| * | | | | | | | | | fix sidebar job list in IE 11Mike Greiling2017-08-041-0/+2
| | | | | | | | | | |
| * | | | | | | | | | remove nicescroll from jobs page and remove the library from common.bundle.jsMike Greiling2017-08-0410-3737/+98
| | | | | | | | | | |
| * | | | | | | | | | remove nicescroll from wiki sidebarMike Greiling2017-08-043-18/+27
| | | | | | | | | | |
| * | | | | | | | | | remove niceScroll from job trigger variables listMike Greiling2017-08-043-6/+13
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '33902-upgrade-to-webpack-v3' into 'master'Jacob Schatz2017-08-074-113/+500
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to webpack v3.4.0 Closes #33902 See merge request !12298
| * | | | | | | | | | | add thunky to approved licenses (MIT)Mike Greiling2017-08-071-0/+6
| | | | | | | | | | | |
| * | | | | | | | | | | dedupe yarn dependenciesMike Greiling2017-08-071-23/+3
| | | | | | | | | | | |
| * | | | | | | | | | | upgrade webpack to v3.4.0Mike Greiling2017-08-072-23/+172
| | | | | | | | | | | |
| * | | | | | | | | | | upgrade webpack to v3.1.0Mike Greiling2017-08-072-10/+10
| | | | | | | | | | | |
| * | | | | | | | | | | dedupe webpack-dev-middlewareMike Greiling2017-08-071-10/+1
| | | | | | | | | | | |
| * | | | | | | | | | | add disableHostCheck to devServer config since webpack dev server is proxiedMike Greiling2017-08-071-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | update webpack-dev-server to v2.6.1Mike Greiling2017-08-072-21/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | update karma-webpack to v2.0.4Mike Greiling2017-08-072-13/+13
| | | | | | | | | | | |
| * | | | | | | | | | | update eslint-import-resolver-webpack to v0.8.3Mike Greiling2017-08-072-7/+13
| | | | | | | | | | | |
| * | | | | | | | | | | update babel-loader to v7.1.xMike Greiling2017-08-072-26/+28
| | | | | | | | | | | |
| * | | | | | | | | | | upgrade webpack to v3.0.0Mike Greiling2017-08-072-21/+60
| | | | | | | | | | | |
| * | | | | | | | | | | replace stats-webpack-plugin with webpack-stats-pluginMike Greiling2017-08-073-13/+19
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'github' into 'master'Robert Speicher2017-08-078-47/+74
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve GitHub importer Closes #27429 See merge request !12886
| * | | | | | | | | | | | [ci skip] Update CHANGELOGgithubDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add CHANGELOG entryDouglas Barbosa Alexandre2017-08-071-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add explanation why we should return early for GitHub importerDouglas Barbosa Alexandre2017-08-071-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Change `project.path_with_namespace` to `project.disk_path`Douglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Allow users to disable SSL verification if not connecting to github.comDouglas Barbosa Alexandre2017-08-071-4/+15
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix small typo on Github::Import#fetch_releasesDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Import GitHub releasesDouglas Barbosa Alexandre2017-08-071-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix Github::Import cache for user idsDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Extrac common timeout to a constant on Github::ClientDouglas Barbosa Alexandre2017-08-071-2/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix small typoe on Github::Client#root_endpointDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Expire content cache when repository fetch failsDouglas Barbosa Alexandre2017-08-071-2/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Does not fetch repository when importing from GitHub on import serviceDouglas Barbosa Alexandre2017-08-072-26/+12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Set the new GitHub import as import sourceDouglas Barbosa Alexandre2017-08-072-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Set the GitHub API token on options hashDouglas Barbosa Alexandre2017-08-071-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix small typoe on GitHub import rake taskDouglas Barbosa Alexandre2017-08-071-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move GitHub root endpoint methods to Github::ClientDouglas Barbosa Alexandre2017-08-072-17/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use a custom root endpoint if defined on GH ominiauth provider settingsDouglas Barbosa Alexandre2017-08-072-2/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use project.import_url to fetch repositories from GithubDouglas Barbosa Alexandre2017-08-072-9/+11
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-0729-120/+603
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to be started from a template Closes #32420 See merge request !13108
| * | | | | | | | | | | | | Fix html structureFilipa Lacerda2017-08-072-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes test for removed behavior
| * | | | | | | | | | | | | Port form back to use form_tagZ.J. van de Weg2017-08-073-18/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix HAML lint errorszj-project-templatesZ.J. van de Weg2017-08-071-4/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix last feature test for project templatesZ.J. van de Weg2017-08-073-4/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | After merge cleanupZ.J. van de Weg2017-08-079-22/+36
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixes race condition in project uploadsTiago Botelho2017-08-073-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally picked as: 3fc0dbcbebcd470fe14f8b5fb7ad55dc3912402e. But given the internals changed, this was changed now. The changelog was removed too.
| * | | | | | | | | | | | | Fix eslint errorFilipa Lacerda2017-08-071-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-071990-14974/+19801
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...