summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update Source Sans Pro font: adds support for cyrillic characterscyrillic-fontDmitriy Zaporozhets2015-09-284-0/+0
* Merge branch 'add-activity-dashboard-preference' into 'master' Dmitriy Zaporozhets2015-09-286-5/+38
|\
| * Add user preference to view project activity and starred project activity as ...Stan Hu2015-09-266-5/+38
* | Merge pull request #9669 from aaronsnyder/admin-labels-grammarStan Hu2015-09-263-3/+4
|\ \
| * | Fix grammar in admin area labels .nothing-here-block when no labels exist.Aaron Snyder2015-09-263-3/+4
* | | Merge branch 'patch-1' into 'master' Stan Hu2015-09-261-3/+2
|\ \ \ | |_|/ |/| |
| * | Simplified sentence as per @stanhu's noteCyriac Thomas2015-09-261-1/+1
| * | Fixed grammar on Using Docker Build doc.Cyriac Thomas2015-09-261-3/+2
|/ /
* | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-09-251-1/+1
|\ \
| * \ Merge pull request #9650 from szechyjs/fb-close-commentStan Hu2015-09-251-1/+1
| |\ \ | | |/ | |/|
| | * FogBugz Import: Closed comments may contain user dataJared Szechy2015-09-211-1/+1
* | | Merge branch 'rs-correct-markdown-doc' into 'master' Robert Speicher2015-09-251-2/+2
|\ \ \
| * | | Correct an inaccuracy in the Markdown docRobert Speicher2015-09-251-2/+2
|/ / /
* | | Merge branch 'rs-changelog' into 'master' Robert Speicher2015-09-252-299/+4
|\ \ \ | |/ / |/| |
| * | Remove CHANGELOG-CIRobert Speicher2015-09-251-298/+0
| * | Add unreleased 8.0.3 entry to CHANGELOGRobert Speicher2015-09-251-1/+4
|/ /
* | Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs'Dmitriy Zaporozhets2015-09-252-2/+3
|\ \
| * | Fix Error 500 in creating merge requests with > 1000 diffsStan Hu2015-09-252-2/+3
* | | Merge branch 'fix-stuck-forked-project-import' into 'master' Dmitriy Zaporozhets2015-09-254-2/+13
|\ \ \
| * | | Use after_commit_queue to schedule import job immediatelyStan Hu2015-09-253-5/+13
| * | | Fix bug where projects would appear to be stuck in the forked import stateStan Hu2015-09-252-1/+4
* | | | Merge branch 'unicorn-listen-8080' into 'master' Marin Jankovski2015-09-251-0/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | Make sure Unicorn listens on localhost:8080unicorn-listen-8080Jacob Vosmaer2015-09-251-0/+13
* | | | Merge branch 'handle-bad-head' into 'master' Dmitriy Zaporozhets2015-09-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Error 500 occuring with repositories that have a bad HEADStan Hu2015-09-241-1/+1
| |/ /
* | | Merge branch 'hook-api-updates' into 'master' Stan Hu2015-09-245-4/+38
|\ \ \
| * | | hooks: improve tests for hook APIBen Boeckel2015-09-242-1/+27
| * | | api: add enable_ssl_verification to PUT/POST hooksBen Boeckel2015-09-242-2/+6
| * | | doc: list note_events as a valid parameter for PUT/POST hooksBen Boeckel2015-09-241-0/+2
| * | | api: expose note_events and enable_ssl_verification for hooksBen Boeckel2015-09-242-1/+3
* | | | Merge branch 'get-ci-token-from-ci-projects' into 'master' Robert Speicher2015-09-244-5/+12
|\ \ \ \
| * | | | Test grace auth against gitlab_ci_project with tokenget-ci-token-from-ci-projectsKamil Trzcinski2015-09-241-1/+4
| * | | | Update stub syntaxRobert Speicher2015-09-241-1/+1
| * | | | Fix grack auth specKamil Trzcinski2015-09-241-1/+1
| * | | | Fix specsKamil Trzcinski2015-09-242-2/+2
| * | | | Remove unneeded changeKamil Trzcinski2015-09-241-1/+2
| * | | | Get GitLabCiService token from CI projectKamil Trzcinski2015-09-241-4/+7
* | | | | Merge pull request #9664 from fantasywind/patch-1Robert Schilling2015-09-241-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update 7.14-to-8.0.mdChia Yu Pai2015-09-241-0/+1
* | | | | Merge branch 'update-mailroom' into 'master' Robert Speicher2015-09-245-3/+11
|\ \ \ \ \
| * | | | | Update changelogupdate-mailroomDouwe Maan2015-09-241-0/+2
| * | | | | Add and document option to use StartTLS with mail_room.Douwe Maan2015-09-242-0/+6
| * | | | | Update mail_roomDouwe Maan2015-09-242-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'newrelic-grape' into 'master' Robert Speicher2015-09-242-3/+5
|\ \ \ \ \
| * | | | | Add the newrelic-grape gemnewrelic-grapeJacob Vosmaer2015-09-242-3/+5
* | | | | | Merge branch 'fix-default-avatar-in-network-graph' into 'master' Robert Speicher2015-09-242-1/+2
|\ \ \ \ \ \
| * | | | | | Fix default avatar not showing up in network graphStan Hu2015-09-242-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'rs-troubleshooting' into 'master' Robert Speicher2015-09-242-0/+20
|\ \ \ \ \ \
| * | | | | | Update Troubleshooting sectionsRobert Speicher2015-09-242-7/+8
| * | | | | | Add Troubleshooting section to 7.14 to 8.0 Update guiders-troubleshootingRobert Speicher2015-09-231-0/+9