summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-145-21/+23
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | Move js function to removing accents to vendor/assets/javascriptsDouglas Barbosa Alexandre2016-01-141-7/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre2016-01-141-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTMLDouglas Barbosa Alexandre2016-01-141-0/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-143-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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”
| * | | | | | | | | | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-148-85/+108
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-092-6/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | 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-098-84/+103
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/rs-autosize'Dmitriy Zaporozhets2016-01-145-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix missing autosize requirers-autosizeRobert Speicher2016-01-131-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Autosize textareasRobert Speicher2016-01-135-1/+8
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | 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-1483-565/+397
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | | | | | | 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>
| * | | | | | | | | | | Add suport for layout without containerDmitriy Zaporozhets2016-01-131-1/+1
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'ci/view-build-artifacts' into 'master' Grzegorz Bizon2016-01-1411-49/+145
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add browser for build artifacts Discussion in #3426, closes #3426. See merge request !2123
| * | | | | | | | | | Minor improvements in build arfifacts browserci/view-build-artifactsGrzegorz Bizon2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added also a `Gitlab::Ci::Build::Artifacts::Metadata::ParserError` exception class.
| * | | | | | | | | | Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-143-13/+13
| | | | | | | | | | |
| * | | | | | | | | | Add specs for endpoint meant to be accelerated by workhorseGrzegorz Bizon2016-01-141-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Improvements, readability for artifacts browserGrzegorz Bizon2016-01-146-12/+12
| | | | | | | | | | |
| * | | | | | | | | | Attach download action to artifacts file in ZIP archiveGrzegorz Bizon2016-01-141-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Check if file exists in metadata in download actionGrzegorz Bizon2016-01-141-3/+8
| | | | | | | | | | |
| * | | | | | | | | | Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-142-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this version we will support only relative paths in artifacts metadata. Support for absolute paths will be introduced later.
| * | | | | | | | | | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-142-7/+11
| | | | | | | | | | |
| * | | | | | | | | | Change format of artifacts metadata from text to binary 0.0.1Grzegorz Bizon2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the format of metadata to handle paths, that may contain whitespace characters, new line characters and non-UTF-8 characters. Now those paths along with metadata in JSON format are stored as length-prefixed strings (uint32 prefix). Metadata file has a custom format: 1. First string field is metadata version field (string) 2. Second string field is metadata errors field (JSON strong) 3. All subsequent fields is pair of path (string) and path metadata in JSON format. Path's metadata contains all fields that where possible to extract from ZIP archive like date of modification, CRC, compressed size, uncompressed size and comment.
| * | | | | | | | | | Show file size in artifacts browser using metadataGrzegorz Bizon2016-01-143-2/+6
| | | | | | | | | | |
| * | | | | | | | | | Add method that checks if path exists in `StringPath`Grzegorz Bizon2016-01-141-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Render 404 when artifacts path is invalidGrzegorz Bizon2016-01-141-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Extract artifacts metadata implementation to separate classGrzegorz Bizon2016-01-142-21/+4
| | | | | | | | | | |
| * | | | | | | | | | Improve path sanitization in `StringPath`Grzegorz Bizon2016-01-141-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Parse artifacts metadata stored in JSON formatGrzegorz Bizon2016-01-142-7/+8
| | | | | | | | | | |
| * | | | | | | | | | Use metadata stored in artifacats metadata fileGrzegorz Bizon2016-01-142-4/+19
| | | | | | | | | | |