summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-1154-167/+514
|\
| * Merge branch 'rs-fix-highlighting' into 'master'Douwe Maan2015-09-115-7/+63
| |\
| | * RU-BO-COOOOOOOOPrs-fix-highlightingRobert Speicher2015-09-101-1/+1
| | * Simplify syntax highlighting of new notesRobert Speicher2015-09-101-2/+3
| | * Apply syntax highlighting to Markdown previewsRobert Speicher2015-09-101-0/+1
| | * Add specs for syntax_highlight JSRobert Speicher2015-09-102-1/+51
| | * Prevent result of SyntaxHighlightFilter being sanitizedRobert Speicher2015-09-101-4/+8
| * | Merge branch 'rescue-syntax-highlighting-errors-updated' into 'master'Robert Speicher2015-09-102-3/+2
| |\ \
| | * | Add comments and clean up test for !1274Stan Hu2015-09-102-3/+2
| | |/
| * | Merge branch 'fix-rouge-warning-noise' into 'master'Robert Schilling2015-09-103-26/+3
| |\ \ | | |/ | |/|
| | * Bump rouge to 1.10.1Stan Hu2015-09-103-27/+3
| | * Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting ...Stan Hu2015-09-102-2/+3
| * | Merge branch 'fix-changelog' into 'master'Robert Schilling2015-09-101-3/+1
| |\ \ | | |/ | |/|
| | * Fix some CHANGELOG entriesStan Hu2015-09-101-3/+1
| |/
| * Merge branch 'rs-changelog' into 'master'Robert Speicher2015-09-101-3/+8
| |\
| | * Add missing 7.14.x CHANGELOG entriesRobert Speicher2015-09-101-3/+8
| |/
| * Merge branch 'rescue-syntax-highlighting-errors' into 'master'Robert Schilling2015-09-103-1/+28
| |\
| | * Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-103-1/+28
| * | Merge pull request #9604 from bpetheo/bpetheo_add_service_api_endpoint_to_ret...Stan Hu2015-09-105-0/+190
| |\ \ | | |/ | |/|
| | * Added service API endpoint to retrieve service parametersPetheo Bence2015-09-105-0/+190
| |/
| * Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-1010-80/+77
| |\
| | * Style syntax highlight area for white themeui-improvementsDmitriy Zaporozhets2015-09-103-34/+36
| | * Style blob show pageDmitriy Zaporozhets2015-09-104-10/+10
| | * Improve project fork pageDmitriy Zaporozhets2015-09-102-27/+20
| | * Refactor md variablesDmitriy Zaporozhets2015-09-102-2/+4
| | * Conver forked from button to textDmitriy Zaporozhets2015-09-102-7/+7
| * | Merge branch 'disable-issue-autofill' into 'master'Dmitriy Zaporozhets2015-09-101-1/+1
| |\ \
| | * | Turned off autocomplete for new issue titlesdisable-issue-autofillDarby2015-09-091-1/+1
| * | | Merge branch 'fix-semaphore-twitter-identity-issue' into 'master'Dmitriy Zaporozhets2015-09-101-2/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Fix testStan Hu2015-09-101-2/+4
| * | | Fix fixed layoutDmitriy Zaporozhets2015-09-101-1/+1
| |/ /
| * | Merge pull request #9617 from dukex/patch-1Robert Speicher2015-09-091-1/+1
| |\ \
| | * | fix 7.14 stable branch nameDuke2015-09-091-1/+1
| |/ /
| * | Improve accounts page UIDmitriy Zaporozhets2015-09-101-0/+1
| * | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-099-15/+62
| |\ \
| | * | Fix last element of sidebar being hidden for small screensDmitriy Zaporozhets2015-09-091-1/+1
| | * | Enable blank container for group settings pageDmitriy Zaporozhets2015-09-092-3/+8
| | * | Style panels and add blank containerDmitriy Zaporozhets2015-09-098-13/+55
| * | | Merge branch 'nav-improvements' into 'master'Dmitriy Zaporozhets2015-09-0914-54/+53
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Use page title for header title tooDmitriy Zaporozhets2015-09-0913-49/+47
| | * Separate profile settings link from the rest on sidebarDmitriy Zaporozhets2015-09-091-5/+6
| |/
| * Merge branch 'rouge-patch' into 'master'Robert Speicher2015-09-092-0/+25
| |\
| | * Fix highlighting of deleted lines in diffs.rouge-patchDouwe Maan2015-09-092-0/+25
| * | Merge branch 'issue-1952' into 'master'Kamil Trzciński2015-09-092-0/+6
| |\ \
| | * | Fixed #1952 docker ssh connection times can be slow when UseDNS is enabledRowan Wookey2015-08-262-0/+4
| * | | Merge branch 'redis-session-expire-delay' into 'master'Dmitriy Zaporozhets2015-09-091-1/+6
| |\ \ \
| | * | | Fix reading session_expire_delay when application settings are not yet create...Kamil Trzcinski2015-09-091-1/+6
| * | | | Merge branch 'fix-emojis-relative-url' into 'master'Douwe Maan2015-09-095-1/+14
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix emoji URLs in Markdown when relative_url_root is usedStan Hu2015-09-065-1/+14
* | | | | Remove kaminari views moved from CIDmitriy Zaporozhets2015-09-117-23/+0
View Lorry Controller Status