c6b5ec0fd8
Update MR diff blob_fork_suggestion after jQuery update
...
`.init()` was added in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10858
We need to add it the MR diff instance that was added in a separate MR
and of course didn't add a conflict because it is a completely different
piece
2017-04-25 13:24:27 -05:00
a27b59f620
Fix diffs with edit-forking needs
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276
2017-04-24 10:22:26 -05:00
4bdbccfc06
Remove Vue from main bundle and disable production warnings
2017-04-07 19:36:09 +00:00
ac35566403
Fixed duplicate jQuery AJAX spyon
2017-04-07 16:37:19 +01:00
ae62fc05e9
Fixes failing spec
2017-04-06 23:19:30 -05:00
f66e1c1734
Destroys pipeline table component when we change tabs in order to stop polling
2017-04-06 23:50:37 +02:00
880b53e0b4
Reset container width when switching to pipelines MR tab
...
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29539
2017-03-28 10:59:54 -05:00
578b90116e
Remove forced scroll into view when switching to "Changes" MR tab
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29897
2017-03-23 15:00:55 -05:00
5f7c0bd7b7
remove Cookies class from global space
2017-03-22 03:07:27 -05:00
572f9782d5
Remove .es6 from file extensions ( !9241 )
2017-03-05 21:22:40 +01:00
f14c5ae888
refactor MergeRequestTabs to es6 class syntax
2016-12-02 17:32:37 -06:00
6c978994e1
fix diff line highlighting by moving method from the MergeRequestTabs class to the Diff class.
2016-12-02 17:32:37 -06:00
2de245c7ba
temporarily revert "Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found"
...
This reverts commit d2ee380816
2016-12-02 17:32:37 -06:00
f90b6200e4
Clean up common_utils.js ( !7318 )
2016-12-01 23:16:09 +01:00
657d470f44
Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into 'master'
...
Adds hash anchors to diff_files to make possible linking exact file in commit
Closes #24010
See merge request !7298
2016-11-17 10:14:55 +00:00
5b876592b4
Fix double event and xhr request call on MR page !7298
...
On page merge_requests/n/diffs and merge_requests/n/commits 'shown.bs.tab' event triggers twice when tab is loading which lead to extra ajax request for data each time.
This commit prevent this event from triggering twice when tab is loading.
2016-11-15 20:51:02 +03:00
7cefaea876
explicitly disable eslint inline
2016-11-15 16:30:34 +00:00
52f29501be
Merge branch 'vue2' into 'master'
...
Migration to Vuejs version 2
List of required changes for our Vue usages
- `init` ➡️ `beforeCreate`
- `read` ➡️ `mounted`
- `$els` ➡️ `$refs`
- 🚫 `$remove` completely removed. ✅ Use `indexOf` and `splice`
- 🚫 HTML embedding with `{{{ }}}` is deprecated. ✅ Use `v-html`
See merge request !7254
2016-11-11 18:25:38 +00:00
c8133c53b2
Changed how resolving notes is rendered
...
Vue2 was taking the template out & then appending again. This changes that
2016-11-10 17:53:34 +03:00
f02f08f53c
Account for merge request fixed affix bar
...
account for merge request fixed affix bar when adjusting scroll targets
2016-11-10 01:16:21 +00:00
3981f9f968
Merge branch '21633-permalink-to-collapsed-diff-line-does-not-work' into 'master'
...
Fixed anchoring diff lines in collapsed diffs
## What does this MR do?
This MR adds the ability to `forceLoad` a collapsed diff from instantiation, on top of this, if it is force loaded, we can pass a callback function to be invoked when the content is loaded.
Now when a MR is loaded, we check for a diff line anchor that is currently within a collapsed diff, we re-instantiate the `singleFileDiff` with the `forceLoad` option. We also pass a callback function that in responsible for highlighting and scrolling to the specified anchor.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
We currently cannot anchor link to collapsed diff lines as the do not auto-expand.
## Screenshots (if relevant)
https://youtu.be/fZVLlP6kchw
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG ) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md )
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html )
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides )
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
## What are the relevant issue numbers?
Closes #21633
See merge request !6285
2016-11-01 20:31:04 +00:00
02f94cf038
disable ESLint for all JavaScript files
2016-10-26 10:02:58 +02:00
67d2b2acb3
replace jquery.cookie vendor script with js.cookie
2016-10-24 18:09:00 -05:00
3ea3a6a152
invoked the pipelines class when builds are dynamically loaded and dispatched for commit builds page
2016-10-24 13:20:37 -05:00
d2ee380816
Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found
...
Use url utility to retrieve hash
2016-10-21 22:28:16 +01:00
a28371dbe3
Fixed issue when images are loading it would push off the tabs
2016-10-20 19:34:35 +01:00
4e03f4c406
Fixed issues with sticky mr tabs & sidebar
...
Closes #23504
2016-10-20 19:34:35 +01:00
05762f449e
Merge branch 'mr-tabs-affix' into 'master'
...
Merge request tabs stick when scrolling page
## What does this MR do?
When scrolling merge requests this sticks the tabs to below the navigation for easy access.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #20548
See merge request !6382
2016-10-14 20:57:21 +00:00
ca3c0c6cd9
MergeRequest new form load diff asynchronously
2016-10-06 11:19:14 +02:00
97dc95b18e
Fixed tests
2016-10-06 10:17:34 +01:00
c65ea7a5c3
Merge request tabs stick when scrolling page
...
Closes #20548
2016-10-06 10:17:34 +01:00
76ae5af8ce
ensure the 'fixed layout' preference is honored whenever possible
...
see #22343 for issue description
2016-09-20 00:51:00 -05:00
2eb2cbe6ae
Fix line diff side-by-side line highlighting
2016-09-13 11:51:52 +01:00
913857e577
Require comments must be included before code
2016-09-08 14:07:27 -05:00
7f6474b269
Restore comments lost when converting CoffeeScript to JavaScript
2016-09-08 12:23:12 -05:00
b5d0346a99
Merge branch 'master' into diff-line-comment-vuejs
2016-08-18 09:21:40 -06:00
43252ccbee
Fix tabs navigation and do not update URL via pushstate
2016-08-17 22:51:49 -05:00
d8654744cd
Merge branch 'master' into diff-line-comment-vuejs
2016-08-17 12:10:09 -06:00
e5f9fdf90c
Refactor merge_request-tabs
2016-08-16 20:34:49 -05:00
ffbba55bc8
Implement Jump behavior for Changes tab
2016-08-04 18:01:32 -07:00
8bdd88a41b
Checks if DiffNotesApp is defined
2016-08-01 13:03:16 +01:00
d6e724d90f
Moved method to compile components from window into diffnotesapp
2016-08-01 10:21:57 +01:00
efb74875cf
Moved most of the data handling into discussion & notes models
...
Reduced some duplicated code with compiling components
Fixed bug with resolve button tooltip not updating after resolving discussion
2016-07-29 11:19:56 +01:00
86446846e9
Added tests for resolving comments feature
2016-07-27 16:57:48 +01:00
6537a4a8fe
Correctly resolves/unresolves discussions
2016-07-26 13:44:51 +01:00
2f5ee5ed20
Merge branch 'master' into diff-line-comment-vuejs
2016-07-26 11:10:27 +01:00
d71d3b8c2b
Convert to javascript
2016-07-25 16:19:20 -05:00
aaa9509d12
ES6ify all the things!
2016-07-24 23:45:11 +03:00
Eric Eastwood
Mike Greiling
Phil Hughes
Alfredo Sumaran
Filipa Lacerda
Mike Greiling
winniehell
Sean McGivern
Yar
Luke "Jared" Bennett
Fatih Acet
Luke Bennett
Paco Guzman
Jared Deckard
Connor Shea
Annabel Dunstone
Douwe Maan