Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | atom links with rss token instead of private token | Alexis Reigel | 2017-05-24 | 1 | -1/+1 |
| | |||||
* | Add system note with link to diff comparison when MR discussion becomes outdated | Douwe Maan | 2017-05-23 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Valery Sizov | 2017-05-23 | 23 | -153/+188 |
|\ | | | | | | | 17489-hide-code-from-guests | ||||
| * | Fix ProjectCacheWorker for plain READMEs | Toon Claes | 2017-05-18 | 1 | -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 Zaporozhets | 2017-05-17 | 1 | -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-widget | Douwe Maan | 2017-05-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dm-contributing-viewer' into 'master' | Rémy Coutable | 2017-05-17 | 1 | -0/+15 |
| |\ \ | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CONTRIBUTING See merge request !11364 | ||||
| | * | | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewer | Douwe Maan | 2017-05-16 | 1 | -0/+15 |
| | |/ | |||||
| * | | Merge branch 'ability_to_cancel_attaching_file' into 'master' | Douwe Maan | 2017-05-16 | 1 | -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 UI | blackst0ne | 2017-05-16 | 1 | -2/+3 |
| | | | |||||
| * | | Merge branch 'dm-blob-viewer-concerns' into 'master' | Robert Speicher | 2017-05-16 | 1 | -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-concerns | Douwe Maan | 2017-05-15 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | max_size | ||||
| * | | | Merge branch '31386-profile-fix-externallinks' into 'master' | Douwe Maan | 2017-05-16 | 1 | -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 Zallmann | 2017-05-11 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fixing Static Analysis Fail with Indentation | Tim Zallmann | 2017-05-08 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Created Application Helpers based on suggestion for easier parsing | Tim Zallmann | 2017-05-08 | 1 | -0/+19 |
| | | | | | |||||
| * | | | | Rename Personal Audit Log | Tim Zallmann | 2017-05-16 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'omega-submodules' into 'master' | Robert Speicher | 2017-05-15 | 1 | -0/+4 |
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | Omega submodules See merge request !10797 | ||||
| | * | | | submodule_links: Handle in-repository submodule urls | David Turner | 2017-05-15 | 1 | -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 Maan | 2017-05-12 | 1 | -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-key | Dmitriy Zaporozhets | 2017-05-12 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Add parent full path to project list cache key | Dmitriy Zaporozhets | 2017-05-12 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Consistently use monospace font for commit SHAs and branch and tag names | Douwe Maan | 2017-05-12 | 5 | -24/+27 |
| | | | | | | |||||
| * | | | | | Fix accessibility issues for Input fields across GitLab | Kushal Pandya | 2017-05-12 | 1 | -1/+4 |
| |/ / / / | |||||
| * | | | | Merge branch 'fixes_for_multiple_issue_assignees' into 'master' | Sean McGivern | 2017-05-12 | 1 | -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_assignees | Valery Sizov | 2017-05-11 | 1 | -2/+3 |
| | |/ / | |||||
| * | | | Merge branch 'refactor-realtime-issue' into 'master' | Filipa Lacerda | 2017-05-12 | 1 | -5/+3 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Refactored issue tealtime elements See merge request !11242 | ||||
| | * | | Remove some weird code to add/remove the task status | Phil Hughes | 2017-05-11 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | Moved the data into the data method Renamed edited ago class name | ||||
| * | | | Implement auxiliary blob viewers | Douwe Maan | 2017-05-10 | 1 | -5/+2 |
| |/ / | |||||
| * | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵ | Robert Speicher | 2017-05-10 | 11 | -14/+14 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063 | ||||
| | * | | Enable the Style/TrailingCommaInLiteral cop | Rémy Coutable | 2017-05-10 | 11 | -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 Maan | 2017-05-10 | 1 | -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 Speicher | 2017-05-10 | 1 | -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 Maan | 2017-05-10 | 1 | -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 avatars | blackst0ne | 2017-05-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'patch-5' into 'master' | Douwe Maan | 2017-05-10 | 1 | -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 path | zzjin | 2017-05-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update tree_helper.rb to fix #31784, which broken file browse where paths ↵ | zzjin | 2017-05-09 | 1 | -1/+1 |
| | |/ | | | | | | | | | | deeper than 6:'/'. | ||||
| * | | Make tree, blob and blame pages more consistent | Douwe Maan | 2017-05-09 | 2 | -6/+4 |
| | | | |||||
| * | | Merge request widget redesign | Fatih Acet | 2017-05-09 | 2 | -55/+4 |
| |/ | |||||
| * | Add confirm delete protected branch modal | Sam Rose | 2017-05-08 | 1 | -10/+0 |
| | | |||||
| * | Add Pipeline Schedules that supersedes experimental Trigger Schedule | Zeger-Jan van de Weg | 2017-05-07 | 2 | -0/+31 |
| | | |||||
* | | Hide clone panel and file list when user is only a guest | James Clark | 2017-05-07 | 1 | -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 McGivern | 2017-05-05 | 2 | -8/+9 |
|\ | |||||
| * | Change 'exclude_author' param | blackst0ne | 2017-05-04 | 1 | -2/+2 |
| | | |||||
| * | Add last_edited_at and last_edited_by attributes | blackst0ne | 2017-05-04 | 1 | -7/+7 |
| | | |||||
| * | Add author to 'Edited time ago by ...' message | blackst0ne | 2017-05-04 | 1 | -1/+1 |
| | | |||||
| * | Add system note on description change of issue/merge request | blackst0ne | 2017-05-04 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 2 | -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 Sizov | 2017-05-05 | 4 | -1/+20 |
| |\ \ | | | | | | | | | | | | | skip] |