summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Document new API pagination headersrc-document-new-api-pagination-headersRémy Coutable2016-01-141-1/+24
|
* Merge branch 'add-pagination-headers-to-api' into 'master' Dmitriy Zaporozhets2016-01-145-12/+49
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pagination headers to already paginated API resources Following #3045, I've added pagination headers using already available Kaminari methods. ## Pagination headers in action ![Screen_Shot_2016-01-14_at_12.14.53](/uploads/88807f754dd9aafbb24da85f6bdf9521/Screen_Shot_2016-01-14_at_12.14.53.png) --- I've also added a shared example to test paginated API resources. A possible next step would be to paginate all the API resources that return an array. See merge request !2426
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-14148-729/+2131
| |\ | | | | | | | | | add-pagination-headers-to-api
| * | 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 branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-1423-49/+452
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GitHub doesn’t apply these constraints to theirs wiki slug allowing characters like `,`, `:`, `*`, etc, we need to relax our constraints or some wiki pages will not be available after they were imported. For an example the Devise project have a wiki page with the following slug: “How To: Add sign_in, sign_out, and sign_up links to your layout template”
| | * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437 ![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png) ![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png) See merge request !2068
| | * | | #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 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
| | | | |
* | | | | Merge branch 'new-buttons-everywhere' into 'master' Dmitriy Zaporozhets2016-01-1410-83/+61
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Standartize buttons and fields size Fixes #8069 and #8070 See merge request !2428
| * | | | Standartize buttons and fields sizeDmitriy Zaporozhets2016-01-1410-83/+61
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'closing-mr-bug-fix' into 'master' Dmitriy Zaporozhets2016-01-142-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug with commenting on merge requests See merge request !2415
| * | | | | 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
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add margin to pages where is no headerremove-gray-bgDmitriy Zaporozhets2016-01-144-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Update files/diffs to match new layoutDmitriy Zaporozhets2016-01-1412-17/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix files, project settings and few more pages with new layoutDmitriy Zaporozhets2016-01-147-7/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix testsDmitriy Zaporozhets2016-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add CHANGELOG itemDmitriy Zaporozhets2016-01-131-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Use closest instead of parent()Dmitriy Zaporozhets2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Dont use nav-pills. Instead use nav-listsDmitriy Zaporozhets2016-01-134-109/+94
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Replace nav-tabs with nav-linksDmitriy Zaporozhets2016-01-1311-79/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add top margin for page titleDmitriy Zaporozhets2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Apply new layout to user pageDmitriy Zaporozhets2016-01-134-69/+72
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Allign md header componentsDmitriy Zaporozhets2016-01-132-8/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Increase detail-page-header padding to match height with nav-linkDmitriy Zaporozhets2016-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Update UI help page with only one nav-link exampleDmitriy Zaporozhets2016-01-131-17/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Replace all navigation menu with nav-links classDmitriy Zaporozhets2016-01-1338-73/+80
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Start moving all navigation to one classDmitriy Zaporozhets2016-01-138-137/+41
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | New layout without background colorDmitriy Zaporozhets2016-01-1318-60/+63
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status