Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | 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] | ||||
| * | | | Fix specs | Clement Ho | 2017-05-04 | 1 | -6/+5 |
| | | | | |||||
| * | | | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 2 | -0/+43 |
| | |/ | |/| | |||||
* | | | Merge branch '24883-build-failure-summary-page' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Build failures summary page for pipelines Closes #24883 See merge request !10719 | ||||
| * | | | Failed Jobs tab only shows 10 job traces for performance24883-build-failure-summary-page | James Edwards-Jones | 2017-05-05 | 1 | -2/+6 |
| | | | | |||||
| * | | | Build failures summary page for pipelines | James Edwards-Jones | 2017-05-05 | 1 | -0/+8 |
| | | | | |||||
* | | | | Support comments for personal snippets | Jarka Kadlecova | 2017-05-05 | 2 | -1/+48 |
| |_|/ |/| | | |||||
* | | | Merge branch 'issue-boards-no-avatar' into 'master' | Filipa Lacerda | 2017-05-05 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed avatar not displaying in issue boards Closes #31428 See merge request !10977 | ||||
| * \ \ | Merge branch 'master' into issue-boards-no-avatar | Phil Hughes | 2017-05-04 | 11 | -42/+120 |
| |\ \ \ | |||||
| * | | | | Fixed avatar not displaying in issue boards | Phil Hughes | 2017-04-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens when Gravatar is disabled in the admin settings, the avatar is returned as null & then frontend didn't do anything about it. Closes #31428 | ||||
* | | | | | Merge branch 'adam-separate-slash-commands' into 'master' | Rémy Coutable | 2017-05-05 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display slash commands outcome when previewing Markdown Closes #21531 See merge request !10054 | ||||
| * | | | | | Display slash commands outcome when previewing Markdownadam-separate-slash-commands | Rares Sfirlogea | 2017-05-04 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove slash commands from Markdown preview and display their outcome next to the text field. Introduce new "explanation" block to our slash commands DSL. Introduce optional "parse_params" block to slash commands DSL that allows to process a parameter before it is passed to "explanation" or "command" blocks. Pass path for previewing Markdown as "data" attribute instead of setting a variable on "window". | ||||
* | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' | Sean McGivern | 2017-05-04 | 2 | -1/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Use blob viewer for job artifacts Closes #31297 See merge request !11018 | ||||
| * | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewer | Douwe Maan | 2017-05-04 | 2 | -1/+7 |
| |/ / / |