summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-161-3/+4
|\
| * Rename BlobViewer max_size to overridable_max_size and absolute_max_size to m...dm-blob-viewer-concernsDouwe Maan2017-05-151-2/+2
| * Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-131-1/+2
* | Merge branch 'omega-submodules' into 'master'Robert Speicher2017-05-151-0/+13
|\ \ | |/ |/|
| * submodule_links: Handle in-repository submodule urlsDavid Turner2017-05-151-0/+13
* | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-121-2/+2
|\ \
| * | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-121-8/+2
| * | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-121-0/+6
| |/
* | Merge branch 'dm-dependency-linker-gemfile' into 'master' Sean McGivern2017-05-121-2/+2
|\ \ | |/ |/|
| * Fix specsDouwe Maan2017-05-101-2/+2
* | Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-101-0/+12
* | Use relative paths for group/project/user avatarsblackst0ne2017-05-102-7/+20
|/
* Merge request widget redesignFatih Acet2017-05-091-192/+0
* Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-051-0/+17
|\
| * Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-0/+17
* | Support comments for personal snippetsJarka Kadlecova2017-05-051-0/+75
|/
* Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' Sean McGivern2017-05-031-0/+139
|\
| * Allow commenting on older versions of the diff and comparisons between diff v...dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-0/+139
* | Merge branch 'dm-blob-external-storage' into 'master' Sean McGivern2017-05-031-16/+32
|\ \
| * | Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-031-16/+32
| |/
* | Merge branch 'emoji-button-titles' into 'master' Filipa Lacerda2017-05-031-1/+1
|\ \ | |/ |/|
| * Merge branch 'master' into emoji-button-titlesPhil Hughes2017-04-272-32/+26
| |\
| * \ Merge branch 'master' into emoji-button-titlesPhil Hughes2017-04-275-13/+97
| |\ \
| * | | Fixed GFM spec failurePhil Hughes2017-04-251-1/+1
* | | | Merge branch '12910-personal-snippets-notes-show' into 'master' Sean McGivern2017-05-021-0/+61
|\ \ \ \
| * | | | Display comments for personal snippets12910-personal-snippets-notes-showJarka Kadlecova2017-05-021-0/+61
* | | | | Merge branch '26488-target-disabled-mr' into 'master' Sean McGivern2017-05-021-1/+45
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix 404 when upstream has disabled merge requestsmhasbini2017-04-271-1/+45
* | | | | Use blob viewers for snippetsDouwe Maan2017-04-301-0/+1
* | | | | Pull preserve into render helpersDouwe Maan2017-04-281-1/+1
* | | | | Address feedbackDouwe Maan2017-04-271-24/+30
* | | | | Satisfy RubocopDouwe Maan2017-04-271-1/+0
* | | | | Add specsDouwe Maan2017-04-271-0/+110
* | | | | Fix some specsDouwe Maan2017-04-271-3/+2
| |_|_|/ |/| | |
* | | | Remove the unnecessary ApplicationSetting stubbingToon Claes2017-04-271-1/+0
* | | | Fix failing specsToon Claes2017-04-271-1/+1
* | | | Refactor MarkupHelperDouwe Maan2017-04-271-10/+10
* | | | Cache the rendered README, but post-process on showToon Claes2017-04-272-29/+26
* | | | Move some methods from ApplicationHelper to MarkupHelperToon Claes2017-04-271-2/+0
* | | | Rename GitlabMarkdownHelper -> MarkupHelperToon Claes2017-04-271-1/+1
| |_|/ |/| |
* | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'Sean McGivern2017-04-271-2/+2
|\ \ \ | |/ / |/| |
| * | Fix rendering emoji inside a stringblackst0ne2017-04-251-2/+2
* | | Merge branch '26509-show-update-time' into 'master' Annabel Dunstone Gray2017-04-261-1/+1
|\ \ \
| * | | Add updated time to project listJeff Stubler2017-04-211-1/+1
| |/ /
* | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-262-7/+20
* | | Merge branch '20378-natural-sort-issue-numbers' into 'master'Sean McGivern2017-04-261-5/+32
|\ \ \
| * | | Change issues sentence to use natural sortingJeff Stubler2017-04-251-5/+32
* | | | Merge branch 'add-aria-to-icon' into 'master' Jacob Schatz2017-04-241-0/+15
|\ \ \ \
| * | | | Improve specsadd-aria-to-iconClement Ho2017-04-241-1/+3
| * | | | Add testsClement Ho2017-04-181-0/+13
| | |/ / | |/| |