summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove coveralls linescleanup-forgotten-linesZ.J. van de Weg2016-06-302-10/+0
* Merge branch 'fix-changelog' into 'master' Rémy Coutable2016-06-301-1/+0
|\
| * Fix wrong line in changelogRobert Schilling2016-06-301-1/+0
* | Merge branch 'fix_restore_warning' into 'master' Rémy Coutable2016-06-302-1/+3
|\ \
| * | Fix restore warning messageDrew Blessing2016-06-282-1/+3
* | | Merge branch 'sidebar-breakpoint' into 'master' Jacob Schatz2016-06-302-2/+2
|\ \ \
| * | | Updated breakpoint for sidebar pinningPhil Hughes2016-06-302-2/+2
* | | | Merge branch '18709-branch-tag-collection-caching' into 'master' Yorick Peterse2016-06-305-14/+78
|\ \ \ \
| * | | | Expire branch/tag git data when needed.18709-branch-tag-collection-cachingPaco Guzman2016-06-305-14/+78
* | | | | Merge branch 'rack-request-trusted-proxies' into 'master' Douwe Maan2016-06-303-4/+22
|\ \ \ \ \
| * | | | | Make Rack::Request use our trusted proxies when filtering IP addressesrack-request-trusted-proxiesDJ Mountney2016-06-293-4/+22
| | |_|_|/ | |/| | |
* | | | | Merge branch 'code_style_fixes' into 'master' Robert Speicher2016-06-3041-45/+44
|\ \ \ \ \
| * | | | | Remove unnecessary parenscode_style_fixesValery Sizov2016-06-3041-45/+44
* | | | | | Merge branch 'rubocop/enable-unneeded-capital-w-cop' into 'master' Robert Speicher2016-06-303-5/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Enable Style/UnneededCapitalW Rubocop coprubocop/enable-unneeded-capital-w-copGrzegorz Bizon2016-06-303-5/+5
* | | | | | Merge branch 'pin-nav-cookie-expiry' into 'master' Jacob Schatz2016-06-301-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Expiry date on pinned nav cookiepin-nav-cookie-expiryPhil Hughes2016-06-301-2/+2
| |/ / / /
* | | | | Merge branch 'global-ajax-error-handler' into 'master' Dmitriy Zaporozhets2016-06-302-0/+10
|\ \ \ \ \
| * | | | | Added global ajax error handler to show a flash notification for failed reque...global-ajax-error-handlerFatih Acet2016-06-212-0/+10
* | | | | | Merge branch 'issue-18886' into 'master' Dmitriy Zaporozhets2016-06-306-6/+38
|\ \ \ \ \ \
| * | | | | | Loop all disks when displaying system infoissue-18886Josh Frye2016-06-296-6/+38
* | | | | | | Merge branch 'remove-converalls-gem' into 'master' Dmitriy Zaporozhets2016-06-303-14/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove coveralls as its unusedremove-converalls-gemZ.J. van de Weg2016-06-303-14/+1
* | | | | | | Merge branch 'shards' into 'master' Yorick Peterse2016-06-3057-413/+779
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch 'shards-config' into 'shards' Yorick Peterse2016-06-3013-3/+70
| |\ \ \ \ \ \
| | * | | | | | Add Application Setting to configure default Repository Path for new projectsshards-configAlejandro Rodríguez2016-06-2913-3/+70
| |/ / / / / /
| * | | | | | Create (if necessary) and link the gitlab-shell secret file on the rake insta...shardsAlejandro Rodríguez2016-06-294-19/+43
| * | | | | | Refactor repository paths handling to allow multiple git mount pointsAlejandro Rodríguez2016-06-2947-391/+666
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '19003-file-view-subnav' into 'master' Dmitriy Zaporozhets2016-06-302-7/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Move changelot item "Add sub nav to file page view" to 8.9.4Dmitriy Zaporozhets2016-06-301-2/+1
| * | | | | Fix changelog for 8.9.3Dmitriy Zaporozhets2016-06-301-1/+3
| * | | | | Update CHANGELOGAnnabel Dunstone2016-06-301-0/+3
| * | | | | Add sub nav to file viewAnnabel Dunstone2016-06-301-7/+10
|/ / / / /
* | | | | Merge branch 'fix_filebrowser_reload' into 'master' Fatih Acet2016-06-302-3/+12
|\ \ \ \ \
| * | | | | Update CHANGELOGfix_filebrowser_reloadAlfredo Sumaran2016-06-291-0/+3
| * | | | | Fixes opening files on a new tab with meta key + click or using mouse middle ...Alfredo Sumaran2016-06-291-2/+6
| * | | | | Skip element that is wrapped by a linkAlfredo Sumaran2016-06-291-1/+3
* | | | | | Merge branch '19157-use-shortcuts-is-not-working-on-gitlab-com-help' into 'ma...Fatih Acet2016-06-302-4/+4
|\ \ \ \ \ \
| * | | | | | Exposed 'onToggleHelp() to window object so showHelp() can be a global function'Luke "Jared" Bennett2016-06-292-4/+4
* | | | | | | Merge branch 'left-align-flash-messages' into 'master' Jacob Schatz2016-06-293-2/+18
|\ \ \ \ \ \ \
| * | | | | | | Align flash messages with left side of page content (!4959)winniehell2016-06-293-2/+18
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'handle-redis-not-there' into 'master' Stan Hu2016-06-292-3/+43
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Handle case when Redis cache returns an empty settingStan Hu2016-06-292-3/+10
| * | | | | | Fix database migrations when Redis is not runningStan Hu2016-06-292-3/+36
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs-gitalb-com-staging' into 'master' Robert Speicher2016-06-292-1/+12
|\ \ \ \ \ \
| * | | | | | Update `Gitlab.com?` to support stagingrs-gitalb-com-stagingRobert Speicher2016-06-272-1/+12
* | | | | | | Merge branch 'cache-max-user-access-name' into 'master' Robert Speicher2016-06-293-1/+57
|\ \ \ \ \ \ \
| * | | | | | | Be explicit which project and user ID are memoizedStan Hu2016-06-292-4/+20
| * | | | | | | Memoize the maximum access level for the author of notesStan Hu2016-06-293-1/+41
* | | | | | | | Merge branch 'button-focus-style' into 'master' Jacob Schatz2016-06-291-1/+2
|\ \ \ \ \ \ \ \