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
82,795 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

73 Commits

Author SHA1 Message Date
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Jacques Erasmus a577cfcbb2 Fix broken file name navigation on MRs 2018-10-11 22:32:28 +00:00
Johann Hubert Sonntagbauer db4c1f665f enable jasmine/prefer-jasmine-matcher 2018-10-09 20:30:03 +02:00
Oswaldo Ferreira caf10464c0 Fix LFS uploaded images not being rendered 2018-10-05 22:36:20 +00:00
Fatih Acet d7a3ccb4ce Merge branch '49329-mr-show-commit-details' into 'master' 
Add signature badge and pipeline status to commit details in MR diff

Closes #49329

See merge request gitlab-org/gitlab-ce!22079
 2018-10-04 11:37:33 +00: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
Mike Greiling dfb9ac3a5f Merge branch '_acet-fix-diff-file-header' into 'master' 
Fix showing diff file header for renamed files

Closes #48887

See merge request gitlab-org/gitlab-ce!22089
 2018-10-03 20:54:04 +00:00
Fatih Acet 8aedb71c49
Fix showing diff file header for renamed files 2018-10-03 21:37:54 +02:00
Paul Slaughter becb86ea4e Add pipeline status to diffs/commit_item 
**Notes:**
- Also exposes commit.pipeline_status_path in diffs.json
 2018-10-03 13:18:21 -05:00
Paul Slaughter 5a286eb7a3 Add signature badge to diffs/commit_item 
**Notes:**
- Also exposes commit.signature_html in diffs.json
 2018-10-03 13:18:20 -05: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
Paul Slaughter f390184249 Resolve "Commit details are not displayed when reviewing an MR commit by commit" 2018-09-26 08:28:50 +00: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
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