Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Support comments for personal snippets | Jarka Kadlecova | 2017-05-05 | 1 | -0/+75 |
| | |||||
* | Merge branch 'dm-link-discussion-to-outdated-diff' into 'master' | Sean McGivern | 2017-05-03 | 1 | -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-diff | Douwe Maan | 2017-05-03 | 1 | -0/+139 |
| | | | | | | | | versions | ||||
* | | Merge branch 'dm-blob-external-storage' into 'master' | Sean McGivern | 2017-05-03 | 1 | -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-storage | Douwe Maan | 2017-05-03 | 1 | -16/+32 |
| |/ | |||||
* | | Merge branch 'emoji-button-titles' into 'master' | Filipa Lacerda | 2017-05-03 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | Added emoji description title to award emoji buttons Closes #29971 See merge request !10881 | ||||
| * | Merge branch 'master' into emoji-button-titles | Phil Hughes | 2017-04-27 | 2 | -32/+26 |
| |\ | |||||
| * \ | Merge branch 'master' into emoji-button-titles | Phil Hughes | 2017-04-27 | 5 | -13/+97 |
| |\ \ | |||||
| * | | | Fixed GFM spec failure | Phil Hughes | 2017-04-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch '12910-personal-snippets-notes-show' into 'master' | Sean McGivern | 2017-05-02 | 1 | -0/+61 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Display comments for personal snippets See merge request !10974 | ||||
| * | | | | Display comments for personal snippets12910-personal-snippets-notes-show | Jarka Kadlecova | 2017-05-02 | 1 | -0/+61 |
| | | | | | |||||
* | | | | | Merge branch '26488-target-disabled-mr' into 'master' | Sean McGivern | 2017-05-02 | 1 | -1/+45 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 when upstream disabled merge requests Closes #26488 See merge request !10427 | ||||
| * | | | | Fix 404 when upstream has disabled merge requests | mhasbini | 2017-04-27 | 1 | -1/+45 |
| | | | | | |||||
* | | | | | Use blob viewers for snippets | Douwe Maan | 2017-04-30 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Pull preserve into render helpers | Douwe Maan | 2017-04-28 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Address feedback | Douwe Maan | 2017-04-27 | 1 | -24/+30 |
| | | | | | |||||
* | | | | | Satisfy Rubocop | Douwe Maan | 2017-04-27 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Add specs | Douwe Maan | 2017-04-27 | 1 | -0/+110 |
| | | | | | |||||
* | | | | | Fix some specs | Douwe Maan | 2017-04-27 | 1 | -3/+2 |
| |_|_|/ |/| | | | |||||
* | | | | Remove the unnecessary ApplicationSetting stubbing | Toon Claes | 2017-04-27 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fix failing specs | Toon Claes | 2017-04-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Refactor MarkupHelper | Douwe Maan | 2017-04-27 | 1 | -10/+10 |
| | | | | |||||
* | | | | Cache the rendered README, but post-process on show | Toon Claes | 2017-04-27 | 2 | -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 MarkupHelper | Toon Claes | 2017-04-27 | 1 | -2/+0 |
| | | | | |||||
* | | | | Rename GitlabMarkdownHelper -> MarkupHelper | Toon Claes | 2017-04-27 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | It does more than solely GitLab Markdown, so rename to MarkupHelper. | ||||
* | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser' | Sean McGivern | 2017-04-27 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix rendering emoji inside a string | blackst0ne | 2017-04-25 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch '26509-show-update-time' into 'master' | Annabel Dunstone Gray | 2017-04-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add updated time to project list Closes #26509 See merge request !8514 | ||||
| * | | | Add updated time to project list | Jeff Stubler | 2017-04-21 | 1 | -1/+1 |
| |/ / | |||||
* | | | Load a project's CI status in batch from redis | Bob Van Landuyt | 2017-04-26 | 2 | -7/+20 |
| | | | |||||
* | | | Merge branch '20378-natural-sort-issue-numbers' into 'master' | Sean McGivern | 2017-04-26 | 1 | -5/+32 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Change issues sentence to use natural sorting Closes #20378 See merge request !7110 | ||||
| * | | | Change issues sentence to use natural sorting | Jeff Stubler | 2017-04-25 | 1 | -5/+32 |
| | | | | |||||
* | | | | Merge branch 'add-aria-to-icon' into 'master' | Jacob Schatz | 2017-04-24 | 1 | -0/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add aria to icon See merge request !10670 | ||||
| * | | | | Improve specsadd-aria-to-icon | Clement Ho | 2017-04-24 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Add tests | Clement Ho | 2017-04-18 | 1 | -0/+13 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' | Kamil Trzciński | 2017-04-24 | 1 | -9/+38 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Fix incorrect commit status text on main project page See merge request !10863 | ||||
| * | | | Add specs for new ci status helper method | Grzegorz Bizon | 2017-04-21 | 1 | -9/+38 |
| | | | | |||||
* | | | | submodule_links: handle urls that don't end with .git | David Turner | 2017-04-21 | 1 | -4/+8 |
|/ / / | | | | | | | | | | Signed-off-by: David Turner <novalis@novalis.org> | ||||
* | | | Fix restricted visibility project setting | James Lopez | 2017-04-17 | 1 | -0/+23 |
|/ / | |||||
* | | Change project view default for existing users and anonymous visitors to ↵dz-fix-project-view | Dmitriy Zaporozhets | 2017-04-10 | 1 | -2/+2 |
| | | | | | | | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 2 | -2/+6 |
|\ \ | |||||
| * | | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus` | Bob Van Landuyt | 2017-04-07 | 1 | -1/+1 |
| | | | |||||
| * | | Update project build status cache when transitioning | Bob Van Landuyt | 2017-04-07 | 1 | -1/+1 |
| | | | |||||
| * | | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatus | Bob Van Landuyt | 2017-04-07 | 1 | -1/+5 |
| | | | |||||
* | | | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-06 | 1 | -1/+1 |
|\ \ \ | |/ / | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml | ||||
| * | | Linking to edit file directly | Eric Eastwood | 2017-04-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-06 | 2 | -5/+30 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'path-disclosure-proj-import-export' into 'security' | DJ Mountney | 2017-04-05 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | Fix for path disclosure in project import/export See merge request !2080 | ||||
| * | | Merge branch '30125-markdown-security' | Robert Speicher | 2017-04-05 | 1 | -5/+22 |
| | | | | | | | | | | | | | | | | | | Remove class from SanitizationFilter whitelist See merge request !2079 | ||||
* | | | Fix specs | Douwe Maan | 2017-04-05 | 1 | -17/+0 |
| | | |