summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* atom links with rss token instead of private tokenAlexis Reigel2017-05-241-1/+1
|
* Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-231-1/+2
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Valery Sizov2017-05-2323-153/+188
|\ | | | | | | 17489-hide-code-from-guests
| * Fix ProjectCacheWorker for plain READMEsToon Claes2017-05-181-0/+3
| | | | | | | | | | | | The ProjectCacheWorker refreshes cache periodically, but it runs outside Rails context. So include the ActionView helpers so the `content_tag` method is available.
| * Merge branch 'dm-consistent-commit-widget' into 'master' Dmitriy Zaporozhets2017-05-171-1/+1
| |\ | | | | | | | | | | | | | | | | | | Use same last commit widget on project homepage and tree view Closes #32245 See merge request !11424
| | * Use same last commit widget on project homepage and tree viewdm-consistent-commit-widgetDouwe Maan2017-05-171-1/+1
| | |
| * | Merge branch 'dm-contributing-viewer' into 'master' Rémy Coutable2017-05-171-0/+15
| |\ \ | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CONTRIBUTING See merge request !11364
| | * | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewerDouwe Maan2017-05-161-0/+15
| | |/
| * | Merge branch 'ability_to_cancel_attaching_file' into 'master' Douwe Maan2017-05-161-2/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | Add an ability to cancel attaching file and redesign attaching files UI Closes #15611, #24270, and #28905 See merge request !9431
| | * Add an ability to cancel attaching file and redesign attaching files UIblackst0ne2017-05-161-2/+3
| | |
| * | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-161-4/+4
| |\ \ | | | | | | | | | | | | | | | | Move some blob viewer stuff around without changing behavior See merge request !11358
| | * | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to ↵dm-blob-viewer-concernsDouwe Maan2017-05-151-4/+4
| | | | | | | | | | | | | | | | max_size
| * | | Merge branch '31386-profile-fix-externallinks' into 'master' Douwe Maan2017-05-161-0/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make Twitter Link on Profile page useable by fixing wrong target URL's" Closes #31386 See merge request !10931
| | * | | Fixed Regex(es)Tim Zallmann2017-05-111-2/+2
| | | | |
| | * | | Fixing Static Analysis Fail with IndentationTim Zallmann2017-05-081-2/+1
| | | | |
| | * | | Created Application Helpers based on suggestion for easier parsingTim Zallmann2017-05-081-0/+19
| | | | |
| * | | | Rename Personal Audit LogTim Zallmann2017-05-161-0/+2
| | | | |
| * | | | Merge branch 'omega-submodules' into 'master'Robert Speicher2017-05-151-0/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Omega submodules See merge request !10797
| | * | | submodule_links: Handle in-repository submodule urlsDavid Turner2017-05-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it is useful to store submodules in the same repository which contains links to them. Make the UI support this. See https://github.com/twosigma/git-meta/wiki/The-Omega-Repo for information about this strategy Signed-off-by: David Turner <novalis@novalis.org>
| * | | | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-121-1/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project list cache key Closes #31863 See merge request !11325
| | * | | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-121-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-125-24/+27
| | | | | |
| * | | | | Fix accessibility issues for Input fields across GitLabKushal Pandya2017-05-121-1/+4
| |/ / / /
| * | | | Merge branch 'fixes_for_multiple_issue_assignees' into 'master' Sean McGivern2017-05-121-2/+3
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Fix for Follow-up from "Backport of Multiple Assignees feature Closes #31888 See merge request !11178
| | * | | fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assigneesValery Sizov2017-05-111-2/+3
| | |/ /
| * | | Merge branch 'refactor-realtime-issue' into 'master' Filipa Lacerda2017-05-121-5/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | Refactored issue tealtime elements See merge request !11242
| | * | Remove some weird code to add/remove the task statusPhil Hughes2017-05-111-5/+3
| | | | | | | | | | | | | | | | | | | | Moved the data into the data method Renamed edited ago class name
| * | | Implement auxiliary blob viewersDouwe Maan2017-05-101-5/+2
| |/ /
| * | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵Robert Speicher2017-05-1011-14/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
| | * | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-1011-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-101-16/+30
| | | | | | | | | | | | | | | | | | | | | | | | Sanitize submodule URLs before linking to them in the file tree view See merge request !2084
| * | | Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-101-6/+6
| |/ / | | | | | | | | | | | | | | | (security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
| * | Merge branch 'use_relative_path_for_project_avatars' into 'master' Douwe Maan2017-05-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Use relative paths for group/project/user avatars Closes #13418 and #19662 See merge request !11001
| | * | Use relative paths for group/project/user avatarsblackst0ne2017-05-101-1/+1
| | | |
| * | | Merge branch 'patch-5' into 'master' Douwe Maan2017-05-101-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Update tree_helper.rb to fix #31784, which broken file browse where paths deeper than 6:'/'. Closes #31784 See merge request !11197
| | * | update yield to return string pathzzjin2017-05-101-1/+1
| | | |
| | * | Update tree_helper.rb to fix #31784, which broken file browse where paths ↵zzjin2017-05-091-1/+1
| | |/ | | | | | | | | | deeper than 6:'/'.
| * | Make tree, blob and blame pages more consistentDouwe Maan2017-05-092-6/+4
| | |
| * | Merge request widget redesignFatih Acet2017-05-092-55/+4
| |/
| * Add confirm delete protected branch modalSam Rose2017-05-081-10/+0
| |
| * Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-072-0/+31
| |
* | Hide clone panel and file list when user is only a guestJames Clark2017-05-071-1/+1
|/ | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#17489 Fix test finding two of the same element Capybara will raise an exception because it finds two elements that match .nav-links. This means this test would fail, even if the page meets the conditions for passing the test. Add more tests for guest access
* Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'Sean McGivern2017-05-052-8/+9
|\
| * Change 'exclude_author' paramblackst0ne2017-05-041-2/+2
| |
| * Add last_edited_at and last_edited_by attributesblackst0ne2017-05-041-7/+7
| |
| * Add author to 'Edited time ago by ...' messageblackst0ne2017-05-041-1/+1
| |
| * Add system note on description change of issue/merge requestblackst0ne2017-05-041-0/+1
| |
* | Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-052-0/+42
|\ \ | | | | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089
| * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵Valery Sizov2017-05-054-1/+20
| |\ \ | | | | | | | | | | | | skip]