Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Render modified icon for moved file42314-diff-file | Filipa Lacerda | 2018-02-13 | 1 | -1/+1 |
| | |||||
* | Fix changes dropdown ellipsis working across browserschanges-dropdown-ellipsis | Phil Hughes | 2018-01-09 | 1 | -0/+8 |
| | | | | Closes #41561 | ||||
* | Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-url | Douwe Maan | 2017-12-12 | 1 | -4/+12 |
| | |||||
* | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master' | Rémy Coutable | 2017-11-20 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188 | ||||
| * | Adds Rubocop rule for line break after guard clause | Jacopo | 2017-11-16 | 1 | -0/+1 |
| | | | | | | | | Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses. | ||||
* | | updated to use new sprite icons | Phil Hughes | 2017-11-17 | 1 | -3/+3 |
|/ | |||||
* | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diff | Douwe Maan | 2017-10-02 | 1 | -7/+9 |
| | |||||
* | Merge branch 'master' into ide | Mike Greiling | 2017-08-07 | 1 | -0/+18 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (177 commits) Add changelog Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14 Make contextual sidebar collapsible Fixed sidebar context header hover colors Use correct `Environment`-class within `Gitlab` namespace Remove gl.Activities from Commits page Move `let` calls inside the `describe` block using them Add `/assign me` alias support for assigning issuables to oneself GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError Use `broken_storage` in the fs_shards_spec. Eager load project creators for project dashboards Memoize a user's personal projects count Remove redundant query from User#recent_push Improve checking if projects would be returned Change spelling of gitlab-shell Remove unused #tree-holder Add custom linter for inline JavaScript to haml_lint Rename user_can_admin? because it's more accurate Synchronous zanata community contribution translation Add Korean translation to i18n ... | ||||
| * | Moved changed files into a dropdown | Phil Hughes | 2017-08-03 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | This makes navigating through diff files quickly. Currently we just toggle a list, which could be pretty big. This moves it into a dropdown to make it much easier. Also includes a filter bar to quickly search for certain files/extensions. Closes #29778 | ||||
* | | Merge remote-tracking branch 'origin/master' into ide | Luke "Jared" Bennett | 2017-07-31 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix diff commenting results just after changing view35695-comment-appears-in-a-wrong-place-after-changing-diff-view-to-inline | Sean McGivern | 2017-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | When you change the diff view (inline / side-by-side), we set a cookie based on that new view. When you add a comment, we choose the style to use in the response based on that cookie. However, when you have just changed diff style, the request cookie will contain the old value, so we should use the view param instead. | ||||
* | | Merge remote-tracking branch 'origin/master' into ide | Luke "Jared" Bennett | 2017-07-20 | 1 | -7/+7 |
|\ \ | |/ | |||||
| * | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -7/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into dm-tree-json | Dmitriy Zaporozhets | 2017-06-22 | 1 | -6/+30 |
|\ \ | |/ | |||||
| * | Don't display comment on unchanged line on both sides in parallel diff | Douwe Maan | 2017-06-19 | 1 | -2/+2 |
| | | |||||
| * | Implement diff viewers | Douwe Maan | 2017-06-14 | 1 | -0/+24 |
| | | |||||
| * | Merge branch 'fix_diff_line_comments' into 'master' | Sean McGivern | 2017-06-01 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802 | ||||
| | * | Fix: A diff comment on a change at last line of a file shows as two comments ↵ | Valery Sizov | 2017-05-31 | 1 | -2/+2 |
| | | | | | | | | | | | | in discussion | ||||
| * | | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 1 | -4/+4 |
| |/ | |||||
* | | Add experimental JSON format for tree controller | Douwe Maan | 2017-05-26 | 1 | -4/+4 |
|/ | |||||
* | Pass fallback_diff_refs to Diff::File instead of using view helpers | Douwe Maan | 2017-05-23 | 1 | -20/+4 |
| | |||||
* | Clean up diff rendering | Douwe Maan | 2017-05-23 | 1 | -4/+20 |
| | |||||
* | Add question mark to Gitlab::Diff::File predicate methods | Douwe Maan | 2017-05-23 | 1 | -2/+2 |
| | |||||
* | Consistently use monospace font for commit SHAs and branch and tag names | Douwe Maan | 2017-05-12 | 1 | -2/+2 |
| | |||||
* | Enable the Style/TrailingCommaInLiteral cop | Rémy Coutable | 2017-05-10 | 1 | -1/+1 |
| | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Fix specs | Douwe Maan | 2017-04-09 | 1 | -0/+2 |
| | |||||
* | Correctly display multiple separate discussions on the same diff line | Douwe Maan | 2017-04-05 | 1 | -4/+4 |
| | |||||
* | Show 'too many changes' message for merge requestissue_25017 | Felipe Artur | 2017-01-12 | 1 | -0/+6 |
| | |||||
* | Merge branch 'html-safe-diff-line-content' into 'security' | Robert Speicher | 2016-12-08 | 1 | -1/+3 |
| | | | | | | | | | | Don't accidentally mark unsafe diff lines as HTML safe Fixes potential XSS issue when a legacy diff note is created on a merge request whose diff contained HTML See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249 See merge request !2040 | ||||
* | Remove an extra leading space from diff content | Hiroyuki Sato | 2016-11-04 | 1 | -4/+3 |
| | |||||
* | Avoid commit lookup on diff_helperexplicit-arguments-on-diff_file_html_data | Paco Guzman | 2016-08-10 | 1 | -3/+2 |
| | |||||
* | Add unfold links for Side-by-Side view | Tim Masliuchenko | 2016-08-04 | 1 | -14/+25 |
| | |||||
* | switch from diff_file_collection to diffs20034-safe-diffs | Paco Guzman | 2016-08-03 | 1 | -4/+1 |
| | | | | So we have raw_diffs too | ||||
* | Move to Gitlab::Diff::FileCollection | Paco Guzman | 2016-08-03 | 1 | -1/+1 |
| | | | Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection | ||||
* | Cache highlighted diff lines for merge requests | Paco Guzman | 2016-08-03 | 1 | -6/+5 |
| | | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting. | ||||
* | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' | Robert Speicher | 2016-07-29 | 1 | -2/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop cops that check access modifiers ## What does this MR do? This MR enables Rubocop cops that detect methods that should be restricted but are the part of public API because of access modifiers used improperly. This also fixes existing offenses. ## Why was this MR needed? Some method in our codebase are public instead of being private because it is sometimes difficult to get it right without static analysis. ## What are the relevant issue numbers? See #17478 Closes #17372 See merge request !5014 | ||||
| * | Fix some useless access modifiers in the code | Grzegorz Bizon | 2016-07-19 | 1 | -2/+0 |
| | | |||||
* | | Add Discussion model to represent MR/diff discussiondiscussion-model | Douwe Maan | 2016-07-20 | 1 | -7/+9 |
|/ | |||||
* | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffs | Paco Guzman | 2016-07-18 | 1 | -4/+5 |
| | |||||
* | Merge branch 'master' into faster-diffsfaster-diffs | Jacob Schatz | 2016-07-11 | 1 | -9/+11 |
|\ | |||||
| * | Support renames in diff_for_path actions | Sean McGivern | 2016-07-11 | 1 | -2/+6 |
| | | |||||
| * | Make expand_all param more explicit | Sean McGivern | 2016-07-08 | 1 | -2/+2 |
| | | |||||
| * | DRY up diff_for_path actions | Sean McGivern | 2016-07-08 | 1 | -21/+3 |
| | | | | | | | | | | | | 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters. | ||||
| * | Allow expanding all diffs at once | Sean McGivern | 2016-07-08 | 1 | -0/+4 |
| | | |||||
| * | Ensure only renderable text diffs are collapsed | Sean McGivern | 2016-07-08 | 1 | -0/+1 |
| | | | | | | | | | | Other diffs (those that are too large to render anyway, image diffs, diffs suppressed by .gitattributes) should be rendered immediately. | ||||
| * | Disable overflow messages | Sean McGivern | 2016-07-08 | 1 | -9/+1 |
| | | | | | | | | | | With the option to expand and collapse individual diffs, these aren't needed any more. | ||||
| * | Collapse large diffs by default | Sean McGivern | 2016-07-08 | 1 | -0/+19 |
| | | | | | | | | | | When rendering a list of diff files, skip those where the diff is over 10 KB and provide an endpoint to render individually instead. | ||||
* | | Merge branch 'master' into faster-diffs | Douwe Maan | 2016-07-07 | 1 | -8/+7 |
|\ \ | |/ | | | | | | | | | | | | | | | # Conflicts: # app/helpers/notes_helper.rb # app/views/projects/diffs/_line.html.haml # app/views/projects/diffs/_parallel_view.html.haml # app/views/projects/diffs/_text_file.html.haml # features/steps/shared/diff_note.rb | ||||
| * | Remove duplication, unused methods, and some other style things | Douwe Maan | 2016-07-06 | 1 | -1/+3 |
| | | |||||
| * | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵ | Douwe Maan | 2016-07-06 | 1 | -4/+0 |
| | | | | | | | | responsibility to other classes |