summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Started on issue templates UImultiple-issue-templates-uiLuke "Jared" Bennett2016-07-011-0/+19
* Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.Robert Speicher2016-06-301-4/+21
* Merge branch 'as-fix-changelog-entries' into 'master' Robert Speicher2016-06-301-3/+0
|\
| * Remove additional entries from CHANGELOGAlfredo Sumaran2016-06-301-3/+0
* | Merge branch 'build-reopen-json' into 'master' Gabriel Mazetto2016-06-301-1/+1
|\ \ | |/ |/|
| * Build path sends JSON file pathbuild-reopen-jsonPhil Hughes2016-06-281-1/+1
* | Merge branch 'cleanup-forgotten-lines' into 'master' Robert Speicher2016-06-302-10/+0
|\ \
| * | Remove coveralls linescleanup-forgotten-linesZ.J. van de Weg2016-06-302-10/+0
* | | Merge branch 'fix/build-retry-button-in-view' into 'master' Robert Speicher2016-06-304-1/+57
|\ \ \
| * | | Move Changelog entry for build retry fix to 8.9.4fix/build-retry-button-in-viewGrzegorz Bizon2016-06-301-1/+1
| * | | Add Changelog entry for build sidebar retry link fixGrzegorz Bizon2016-06-301-0/+1
| * | | Improve method that tells if build is retryableGrzegorz Bizon2016-06-303-2/+20
| * | | Do not show build retry link when build is activeGrzegorz Bizon2016-06-302-1/+38
* | | | Merge branch '18991-update-test-env-gitlab-shell-version-when-v3-1-0-is-publi...Yorick Peterse2016-06-301-2/+1
|\ \ \ \
| * | | | Remove hardcoded gitlab-shell version in test env now that the required tag i...Alejandro Rodríguez2016-06-301-2/+1
* | | | | Merge branch 'fix-external-issue-rendering' into 'master' Robert Speicher2016-06-305-6/+45
|\ \ \ \ \
| * | | | | Fix broken spec in git_push_service_spec by stubbing an external issue trackerfix-external-issue-renderingStan Hu2016-06-301-0/+2
| * | | | | Handle external issues in IssueReferenceFilterYorick Peterse2016-06-304-6/+43
* | | | | | Merge branch 'ericidema/gitlab-ce-import-with-github-personal-access-tokens' ...Douwe Maan2016-06-3013-54/+176
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Make GH one-off auth the default again for importing GH projectsRémy Coutable2016-06-306-21/+30
| * | | | | Import from Github using Personal Access Tokens.Eric K Idema2016-06-3012-54/+167
* | | | | | 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