summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* 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 versions See merge request !10388
| * Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-0/+139
| | | | | | | | versions
* | 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 blobs See merge request !11048
| * | 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
|\ \ | |/ |/| | | | | | | | | Added emoji description title to award emoji buttons Closes #29971 See merge request !10881
| * 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 snippets See merge request !10974
| * | | | 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 disabled merge requests Closes #26488 See merge request !10427
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Because the post-processing of the rendered README is dependent on the context (i.e. the current user), do the post-processing when the README is being displayed.
* | | | Move some methods from ApplicationHelper to MarkupHelperToon Claes2017-04-271-2/+0
| | | |
* | | | Rename GitlabMarkdownHelper -> MarkupHelperToon Claes2017-04-271-1/+1
| |_|/ |/| | | | | | | | It does more than solely GitLab Markdown, so rename to MarkupHelper.
* | | 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 list Closes #26509 See merge request !8514
| * | | 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 sorting Closes #20378 See merge request !7110
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add aria to icon See merge request !10670
| * | | | Improve specsadd-aria-to-iconClement Ho2017-04-241-1/+3
| | | | |
| * | | | Add testsClement Ho2017-04-181-0/+13
| | |/ / | |/| |
* | | | Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-241-9/+38
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix incorrect commit status text on main project page See merge request !10863
| * | | Add specs for new ci status helper methodGrzegorz Bizon2017-04-211-9/+38
| | | |
* | | | submodule_links: handle urls that don't end with .gitDavid Turner2017-04-211-4/+8
|/ / / | | | | | | | | | Signed-off-by: David Turner <novalis@novalis.org>
* | | Fix restricted visibility project settingJames Lopez2017-04-171-0/+23
|/ /
* | Change project view default for existing users and anonymous visitors to ↵dz-fix-project-viewDmitriy Zaporozhets2017-04-101-2/+2
| | | | | | | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-072-2/+6
|\ \
| * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-071-1/+1
| | |
| * | Update project build status cache when transitioningBob Van Landuyt2017-04-071-1/+1
| | |
| * | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-071-1/+5
| | |
* | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-061-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
| * | Linking to edit file directlyEric Eastwood2017-04-061-1/+1
| | |
* | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-062-5/+30
|\ \ \ | |/ /
| * | Merge branch 'path-disclosure-proj-import-export' into 'security' DJ Mountney2017-04-051-0/+8
| | | | | | | | | | | | | | | Fix for path disclosure in project import/export See merge request !2080
| * | Merge branch '30125-markdown-security'Robert Speicher2017-04-051-5/+22
| | | | | | | | | | | | | | | | | | Remove class from SanitizationFilter whitelist See merge request !2079
* | | Fix specsDouwe Maan2017-04-051-17/+0
| | |