Commit Graph

40 Commits

Author SHA1 Message Date
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Phil Hughes 14ed916cf2 Merge branch '51958-fix-mr-discussion-loading' into 'master'
Fix MR discussion not loaded issue

Closes #51958

See merge request gitlab-org/gitlab-ce!21982
2018-10-04 07:37:24 +00:00
Phil Hughes 33c4c5b8f3
Added file tree to merge request diffs
This file tree displays all the diff files in a tree like format
Each file is taken and converted into a tree with folders
Each folder can be toggled open & closed
Clicking a file will scroll to the diff file & highlight with a glow affect

Searching the tree list will search only files & return a list of the
files without any folders

Each file row contains an icon to show changed, new file or deleted
Each row will also contain the added & removed lines count

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
2018-10-03 10:05:43 +01:00
Mark Chao f09303b00a Fix MR discussion not loaded issue
Display `formatter` as the sole content of `position` object.
This means `diff_file` data is not referenced, which is the
caseu of "IOError: not opened for reading".
2018-10-01 22:37:43 +08:00
Phil Hughes f1a3eff8d5 Fixed utils spec 2018-09-21 11:59:45 +01:00
Phil Hughes 78f64e83ab Changed `true` string to a boolean
Fixed toBeTruthy to toBe(true) in spec
2018-09-21 11:59:44 +01:00
Phil Hughes e3cc9d53d2 Fixed karma spec for getNoteFormData
Fixed toggling new notes caused by not returning the stores discussion
2018-09-21 11:59:44 +01:00
Phil Hughes 2497c29ef0 Use returned discussion from API
We now use the returned discussion instead of re-fetching
all of the discussions and filtering out the ones we don't need.
This speeds up the process of creating a diff discussions
by saving us another API request before we can render the discussion
2018-09-21 11:59:41 +01:00
André Luís 38beacc926 Resolve "Link to file in Changes tab of MR no longer works for all files after incremental rendering improvement" 2018-09-20 08:21:17 +00:00
Phil Hughes 90673dbcb8
Changed isDiscussionApplicableToLine to accept an object 2018-09-18 16:27:53 +01:00
Phil Hughes c48f0c1aed
Added specs to isDiscussionApplicableToLine
It now tests for the latest diff check
2018-09-17 10:49:41 +01:00
Phil Hughes 5eef5f242a
Updated LegacyDiffNote logic 2018-09-17 09:50:38 +01:00
Phil Hughes ef4e3b6ed3
Moved legacy diff note check into util method
Un-commented out expect checks in mutation spec
2018-09-17 09:50:37 +01:00
Phil Hughes f9e290b9db
Fixed diff store actions spec
Updated diff mutations and utils spec to check for legacy notes
2018-09-17 09:50:37 +01:00
Tim Zallmann 12b48e61af Resolve "On master, inline diff view contains extra `+` and `-` signs" 2018-09-10 08:50:41 +00:00
André Luís 04c0d12d1a Resolve "Merge requests show outdated discussions on changes tab" 2018-09-08 06:37:41 +00:00
Tim Zallmann d2cbe07398 Adapted so utils + actions don't include any mutations and mutations are always against state 2018-09-07 17:13:11 +02:00
Tim Zallmann 982da16bf2 Made the discussion tests artificial to have them stable, mocked RAF + RIC 2018-09-07 12:25:50 +02:00
Tim Zallmann b8ecb2c7eb Added new tests for newly added mutations, actions, utils 2018-09-07 12:25:50 +02:00
Tim Zallmann a0dc392362 Fix Linting Error 2018-09-07 12:25:50 +02:00
Tim Zallmann d3cf0c247b Fix for Karma, Static Analysis and RSPec for MR Page 2018-09-07 12:25:50 +02:00
Tim Zallmann 958cf02e91 Fixes for Karma tests 2018-09-07 12:25:50 +02:00
Tim Zallmann 8563499b0f Fix for Getter + Linting 2018-09-07 12:25:50 +02:00
Tim Zallmann a424e8141b Fixes for Karma Tests 2018-09-07 12:25:50 +02:00
Tim Zallmann 7e390dcc25 Added constants for Render values + Optimised for Loop 2018-08-13 11:55:30 +02:00
Tim Zallmann 8daf9db68f Porting MR Vue Memory Fixes to current master 2018-08-08 02:50:01 +00:00
Filipa Lacerda 47244ad5ea Merge branch 'andr3-remove-mr-regressions-fixes-from-master' into 'master'
Remove fixes for MR refactor regressions from master

See merge request gitlab-org/gitlab-ce!20920
2018-08-01 13:42:23 +00:00
André Luís 09c1b008eb Revert "Merge branch '_acet-fix-outdated-discussions' into 'master'"
This reverts commit 740ae2d194, reversing
changes made to 1ba47de5fe.
2018-08-01 13:45:16 +01:00
Filipa Lacerda 32de37536e Disables toggle comments button for diff with no discussions 2018-07-31 09:24:36 +01:00
Fatih Acet 7632330e50
Fix showing outdated discussions on Changes tab 2018-07-18 00:07:37 +02:00
Tim Zallmann 422dcfde03 Resolve "MR: Reduce the memory footprint of the component tree" 2018-07-17 15:47:02 +00:00
Filipa Lacerda c5a514de76
Adds specs for toggleFileDiscussions action 2018-07-11 15:30:41 +01:00
Filipa Lacerda 57c32c7dbd
Adds specs for getters in merge request vuex diff module 2018-07-11 12:48:24 +01:00
Filipa Lacerda 135ead1d83
Merge branch 'master' into 48237-toggle-file-comments
* master: (38 commits)
  Update bitbucket.md to fix typo and small grammar touchups.
  Update time_helper.rb to fix output for exact minutes.
  Document update for GitLab Pages users.
  Support manually stopping any environment from the UI
  Fix link to frontend in handbook
  Shorten CHANGELOG filename to avoid breaking ecryptfs users
  Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
  Fix mountComponent helper path in docs
  Fix #48537 - Update avatar only via the projects API
  Add additional headline for Adding SSH keys to GitLab
  Request to be a proofreader.
  Fix specs
  Fix search bar text input alignment
  Fix API docs on unauthenticated projects return
  Adds with_projects optional parameter to /groups/:id API endpoint
  Docs: make it clear that you need a completely separate domain for Pages
  Document that we don't want to wait in tests
  Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor
  Remove useless return
  Use latest gitlab-styles
  ...
2018-07-10 18:11:19 +01:00
Filipa Lacerda adb7f45aff
Exports getters individually.
Exports state to allow tests
Adds specs for the getters that didn't have any.
2018-07-06 13:21:02 +01:00
Filipa Lacerda 49828db524 Improves performance on MR refactor and adds specs 2018-07-05 12:05:57 +00:00
Fatih Acet 483864db77 Improve performance of toggling diff view type 2018-07-03 23:18:27 +00:00
Fatih Acet d690cd9992 Prevent fetching diffs and discussions data unnecessarily on MR page 2018-06-29 07:22:07 +00:00
Tim Zallmann 53f77cfee1 Added Diff Viewer to new VUE based MR page 2018-06-26 18:49:22 +00:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00