root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
81,440 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

55 Commits

Author SHA1 Message Date
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
Paul Slaughter ae5600b868 Create specs for diffs/components/app and update modules to export factory functions 2018-09-14 08:25:13 +00:00
André Luís 06025e4a26 Display click to expand on collapsed diffs 2018-09-13 12:34:18 +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
Mike Greiling 6d1b585034 Merge branch 'tz-mr-new-datastructure' into 'master' 
Vue MR Page - Data structure update

See merge request gitlab-org/gitlab-ce!21062
 2018-09-07 23:27:24 +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 d4d5ed59f9 Fixes based on MR discussion around naming, mutations, handling of state 2018-09-07 16:20:57 +02:00
Jan Provaznik d95c1f0335 Use ResourceLabelEvent for tracking label changes 2018-09-07 13:39:20 +00: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 b8b2cb3675 Fixed Problems with Inline View + Specs 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 3e9965f767 Fix for diff_file specs 2018-08-08 10:46:17 +02:00
Tim Zallmann 8daf9db68f Porting MR Vue Memory Fixes to current master 2018-08-08 02:50:01 +00:00
André Luís 8047b00fb6 Reapply "Merge branch '_acet-fix-mr-autosave' into 'master'" 
This reverts commit bd5b177b0fc48d77b5069b112faf36d151221be7.
 2018-08-01 15:26:57 +01: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
André Luís c7cd9ee97c Revert "Merge branch '_acet-fix-mr-autosave' into 'master'" 
This reverts commit 5ba542b109, reversing
changes made to 32c831ea2b.
 2018-08-01 13:45:15 +01:00
André Luís 113f9f337c Revert "Merge branch 'tz-mr-refactor-memory-reduction' into 'master'" 
This reverts commit 2411ecb576, reversing
changes made to 58a0df7e68.
 2018-08-01 13:45:15 +01:00
Filipa Lacerda 32de37536e Disables toggle comments button for diff with no discussions 2018-07-31 09:24:36 +01:00
Filipa Lacerda 202e37bbaf Resolve "Copy diff file path as GFM" is broken 2018-07-30 13:37:28 +00:00
Tim Zallmann b2dbc93694 Reducing the memory footprint for the rendering 2018-07-23 11:24:07 +00:00
Tim Zallmann 5ba542b109 Merge branch '_acet-fix-mr-autosave' into 'master' 
Fix autosave issues for MR discussions

Closes #48876 and #48877

See merge request gitlab-org/gitlab-ce!20569
 2018-07-18 15:12:31 +00:00
Fatih Acet c12ad01693
Fix failing specs :fingers-crossed: 2018-07-18 12:55:56 +02: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
Phil Hughes ca1deb9e5e Merge branch '48951-clean-up' into 'master' 
Resolve "MR refactor: All actions under diff module are being exported twice"

Closes #48951

See merge request gitlab-org/gitlab-ce!20499
 2018-07-10 07:38:48 +00:00
Filipa Lacerda 8186bb3903
Removes unused store in diffs mr refactor 
Removes double export for actions in diffs module in mr refactor
 2018-07-09 15:46:36 +01:00
Filipa Lacerda eed8e8ff70
Call correct action in spec 2018-07-09 13:19:26 +01:00
Tim Zallmann 9eef6cd1bf Resolve "MR refactor: Performance costs of main element with `v-if`" 2018-07-09 11:54:15 +00: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
Tim Zallmann 6d291cc3a6 File Icons in Merge Requests 2018-07-05 12:02:56 +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
Fatih Acet fbf747194f Componentize diff lines and diff comments 2018-06-27 21:20:41 +00:00