summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'collapse-sidebar-bugs' into 'master'Phil Hughes2017-08-078-7/+15
|\
| * Add class to other sidebarsAnnabel Dunstone Gray2017-08-073-3/+3
| * Check if sidebar existscollapse-sidebar-bugsAnnabel Dunstone Gray2017-08-071-1/+1
| * Remove JS flicker on page load; UI tweaksAnnabel Dunstone Gray2017-08-075-4/+12
* | Merge branch 'group-new-issue' into 'master'Clement Ho2017-08-079-18/+251
|\ \
| * | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-079-18/+251
|/ /
* | Merge branch '35761-convdev-perc' into 'master'Sean McGivern2017-08-0711-16/+159
|\ \
| * | Store & use ConvDev percentages returned by Version app35761-convdev-percJarka Kadlecova2017-08-0711-16/+159
* | | Merge branch 'feature/log-provider' into 'master'Sean McGivern2017-08-071-6/+15
|\ \ \
| * | | [EE Backport] Update log audit event in omniauth_callbacks_controller.rbJames Lopez2017-08-071-6/+15
|/ / /
* | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-0710-75/+233
|\ \ \
| * | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-0710-75/+233
* | | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-072-60/+147
|\ \ \ \
| * | | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-072-12/+11
| * | | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-012-60/+148
* | | | | Merge branch '35483-improve-mobile-sidebar' into 'master'Phil Hughes2017-08-077-42/+31
|\ \ \ \ \
| * | | | | Improve mobile sidebarAnnabel Dunstone Gray2017-08-077-42/+31
|/ / / / /
* | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-0716-3761/+139
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | [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