summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* updatedropdown-counter-updateAndriy Dyadyura2016-01-141-2/+2
* updateAndriy Dyadyura2016-01-141-1/+0
* updateAndriy Dyadyura2016-01-142-3/+4
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into dropdow...Andriy Dyadyura2016-01-1411-13/+302
|\
| * Merge branch 'add-pagination-headers-to-api' into 'master' Dmitriy Zaporozhets2016-01-145-12/+49
| |\
| | * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into add-pag...Rémy Coutable2016-01-14148-729/+2131
| | |\
| | * | Revert changes to how the notes are paginated in the APIRémy Coutable2016-01-141-3/+9
| | * | Add pagination headers to already paginated API resourcesadd-pagination-headers-to-apiRémy Coutable2016-01-146-21/+52
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-1434-135/+633
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/rs-autosize'Dmitriy Zaporozhets2016-01-147-1/+253
| |\ \ \ \
| | * | | | Fix missing autosize requirers-autosizeRobert Speicher2016-01-131-0/+1
| | * | | | Autosize textareasRobert Speicher2016-01-137-1/+252
* | | | | | updatepr-page-fix4Andriy Dyadyura2016-01-144-263/+329
| |_|/ / / |/| | | |
* | | | | Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-1423-49/+452
|\ \ \ \ \
| * | | | | Fix parse_gollum_tags matcherDouglas Barbosa Alexandre2016-01-141-2/+2
| * | | | | Update documentation on Banzai::Filter::GollumTagsFilterDouglas Barbosa Alexandre2016-01-141-2/+38
| * | | | | Add tests for the wiki pipelineDouglas Barbosa Alexandre2016-01-144-5/+89
| * | | | | Refactoring Banzai::Filter::GollumTagsFilterDouglas Barbosa Alexandre2016-01-142-23/+28
| * | | | | Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatterDouglas Barbosa Alexandre2016-01-142-3/+3
| * | | | | Remove GollumTagsPipelineDouglas Barbosa Alexandre2016-01-142-15/+4
| * | | | | Refactoring Gitlab::GithubImport::ImporterDouglas Barbosa Alexandre2016-01-141-7/+13
| * | | | | Remove unnecessary brackets on WIKI_SLUG_ID route constraintsDouglas Barbosa Alexandre2016-01-141-1/+1
| * | | | | Move js function to removing accents to vendor/assets/javascriptsDouglas Barbosa Alexandre2016-01-142-7/+14
| * | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-01-141-0/+1
| * | | | | Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre2016-01-144-3/+26
| * | | | | Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTMLDouglas Barbosa Alexandre2016-01-144-0/+210
| * | | | | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-146-36/+23
| * | | | | Import GitHub wiki into GitLabDouglas Barbosa Alexandre2016-01-144-1/+56
| | |_|_|/ | |/| | |
* | | | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-1413-86/+181
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | #can_unsubscribe? -> #?unsubscribable?Zeger-Jan van de Weg2016-01-113-3/+3
| * | | | Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-094-23/+23
| * | | | Add #can_unsubscribe? to SentNotificationZeger-Jan van de Weg2016-01-092-1/+5
| * | | | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-0913-85/+176
* | | | | Merge branch 'new-buttons-everywhere' into 'master' Dmitriy Zaporozhets2016-01-1410-83/+61
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Standartize buttons and fields sizeDmitriy Zaporozhets2016-01-1410-83/+61
* | | | | Merge branch 'closing-mr-bug-fix' into 'master' Dmitriy Zaporozhets2016-01-142-6/+11
|\ \ \ \ \
| * | | | | fixes bug with commenting on merge requestsclosing-mr-bug-fixJacob Schatz2016-01-132-6/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-1485-567/+402
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add margin to pages where is no headerremove-gray-bgDmitriy Zaporozhets2016-01-144-4/+4
| * | | | Update files/diffs to match new layoutDmitriy Zaporozhets2016-01-1412-17/+26
| * | | | Fix files, project settings and few more pages with new layoutDmitriy Zaporozhets2016-01-147-7/+18
| * | | | Fix testsDmitriy Zaporozhets2016-01-131-2/+2
| * | | | Add CHANGELOG itemDmitriy Zaporozhets2016-01-131-0/+3
| * | | | Use closest instead of parent()Dmitriy Zaporozhets2016-01-131-1/+1
| * | | | Dont use nav-pills. Instead use nav-listsDmitriy Zaporozhets2016-01-134-109/+94
| * | | | Replace nav-tabs with nav-linksDmitriy Zaporozhets2016-01-1311-79/+13
| * | | | Add top margin for page titleDmitriy Zaporozhets2016-01-131-1/+1
| * | | | Apply new layout to user pageDmitriy Zaporozhets2016-01-134-69/+72
| * | | | Allign md header componentsDmitriy Zaporozhets2016-01-132-8/+1
| * | | | Increase detail-page-header padding to match height with nav-linkDmitriy Zaporozhets2016-01-131-1/+1