Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'improve-system-info' into 'master' | Stan Hu | 2016-07-01 | 1 | -11/+38 |
|\ | |||||
| * | Catch permission denied errors and ignore the diskimprove-system-info | Josh Frye | 2016-06-30 | 1 | -11/+38 |
* | | Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9. | Robert Speicher | 2016-06-30 | 1 | -4/+21 |
* | | Merge branch 'as-fix-changelog-entries' into 'master' | Robert Speicher | 2016-06-30 | 1 | -3/+0 |
|\ \ | |||||
| * | | Remove additional entries from CHANGELOG | Alfredo Sumaran | 2016-06-30 | 1 | -3/+0 |
* | | | Merge branch 'build-reopen-json' into 'master' | Gabriel Mazetto | 2016-06-30 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Build path sends JSON file pathbuild-reopen-json | Phil Hughes | 2016-06-28 | 1 | -1/+1 |
* | | | Merge branch 'cleanup-forgotten-lines' into 'master' | Robert Speicher | 2016-06-30 | 2 | -10/+0 |
|\ \ \ | |||||
| * | | | Remove coveralls linescleanup-forgotten-lines | Z.J. van de Weg | 2016-06-30 | 2 | -10/+0 |
* | | | | Merge branch 'fix/build-retry-button-in-view' into 'master' | Robert Speicher | 2016-06-30 | 4 | -1/+57 |
|\ \ \ \ | |||||
| * | | | | Move Changelog entry for build retry fix to 8.9.4fix/build-retry-button-in-view | Grzegorz Bizon | 2016-06-30 | 1 | -1/+1 |
| * | | | | Add Changelog entry for build sidebar retry link fix | Grzegorz Bizon | 2016-06-30 | 1 | -0/+1 |
| * | | | | Improve method that tells if build is retryable | Grzegorz Bizon | 2016-06-30 | 3 | -2/+20 |
| * | | | | Do not show build retry link when build is active | Grzegorz Bizon | 2016-06-30 | 2 | -1/+38 |
* | | | | | Merge branch '18991-update-test-env-gitlab-shell-version-when-v3-1-0-is-publi... | Yorick Peterse | 2016-06-30 | 1 | -2/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Remove hardcoded gitlab-shell version in test env now that the required tag i... | Alejandro Rodríguez | 2016-06-30 | 1 | -2/+1 |
* | | | | | Merge branch 'fix-external-issue-rendering' into 'master' | Robert Speicher | 2016-06-30 | 5 | -6/+45 |
|\ \ \ \ \ | |||||
| * | | | | | Fix broken spec in git_push_service_spec by stubbing an external issue trackerfix-external-issue-rendering | Stan Hu | 2016-06-30 | 1 | -0/+2 |
| * | | | | | Handle external issues in IssueReferenceFilter | Yorick Peterse | 2016-06-30 | 4 | -6/+43 |
* | | | | | | Merge branch 'ericidema/gitlab-ce-import-with-github-personal-access-tokens' ... | Douwe Maan | 2016-06-30 | 13 | -54/+176 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Make GH one-off auth the default again for importing GH projects | Rémy Coutable | 2016-06-30 | 6 | -21/+30 |
| * | | | | | Import from Github using Personal Access Tokens. | Eric K Idema | 2016-06-30 | 12 | -54/+167 |
* | | | | | | Merge branch 'fix-changelog' into 'master' | Rémy Coutable | 2016-06-30 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix wrong line in changelog | Robert Schilling | 2016-06-30 | 1 | -1/+0 |
* | | | | | | | Merge branch 'fix_restore_warning' into 'master' | Rémy Coutable | 2016-06-30 | 2 | -1/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fix restore warning message | Drew Blessing | 2016-06-28 | 2 | -1/+3 |
* | | | | | | | Merge branch 'sidebar-breakpoint' into 'master' | Jacob Schatz | 2016-06-30 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Updated breakpoint for sidebar pinning | Phil Hughes | 2016-06-30 | 2 | -2/+2 |
* | | | | | | | Merge branch '18709-branch-tag-collection-caching' into 'master' | Yorick Peterse | 2016-06-30 | 5 | -14/+78 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Expire branch/tag git data when needed.18709-branch-tag-collection-caching | Paco Guzman | 2016-06-30 | 5 | -14/+78 |
* | | | | | | | | Merge branch 'rack-request-trusted-proxies' into 'master' | Douwe Maan | 2016-06-30 | 3 | -4/+22 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Make Rack::Request use our trusted proxies when filtering IP addressesrack-request-trusted-proxies | DJ Mountney | 2016-06-29 | 3 | -4/+22 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'code_style_fixes' into 'master' | Robert Speicher | 2016-06-30 | 41 | -45/+44 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unnecessary parenscode_style_fixes | Valery Sizov | 2016-06-30 | 41 | -45/+44 |
* | | | | | | | | | Merge branch 'rubocop/enable-unneeded-capital-w-cop' into 'master' | Robert Speicher | 2016-06-30 | 3 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Enable Style/UnneededCapitalW Rubocop coprubocop/enable-unneeded-capital-w-cop | Grzegorz Bizon | 2016-06-30 | 3 | -5/+5 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pin-nav-cookie-expiry' into 'master' | Jacob Schatz | 2016-06-30 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Expiry date on pinned nav cookiepin-nav-cookie-expiry | Phil Hughes | 2016-06-30 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'global-ajax-error-handler' into 'master' | Dmitriy Zaporozhets | 2016-06-30 | 2 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Added global ajax error handler to show a flash notification for failed reque...global-ajax-error-handler | Fatih Acet | 2016-06-21 | 2 | -0/+10 |
* | | | | | | | | Merge branch 'issue-18886' into 'master' | Dmitriy Zaporozhets | 2016-06-30 | 6 | -6/+38 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Loop all disks when displaying system infoissue-18886 | Josh Frye | 2016-06-29 | 6 | -6/+38 |
* | | | | | | | | | Merge branch 'remove-converalls-gem' into 'master' | Dmitriy Zaporozhets | 2016-06-30 | 3 | -14/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove coveralls as its unusedremove-converalls-gem | Z.J. van de Weg | 2016-06-30 | 3 | -14/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'shards' into 'master' | Yorick Peterse | 2016-06-30 | 57 | -413/+779 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'shards-config' into 'shards' | Yorick Peterse | 2016-06-30 | 13 | -3/+70 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add Application Setting to configure default Repository Path for new projectsshards-config | Alejandro Rodríguez | 2016-06-29 | 13 | -3/+70 |
| |/ / / / / / / | |||||
| * | | | | | | | Create (if necessary) and link the gitlab-shell secret file on the rake insta...shards | Alejandro Rodríguez | 2016-06-29 | 4 | -19/+43 |
| * | | | | | | | Refactor repository paths handling to allow multiple git mount points | Alejandro Rodríguez | 2016-06-29 | 47 | -391/+666 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '19003-file-view-subnav' into 'master' | Dmitriy Zaporozhets | 2016-06-30 | 2 | -7/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | |