a0ac2d932c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee
2017-10-02 13:15:46 +03:00
209d7575b6
Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-state' into 'master'
...
Resolve "Issue Sidebar : Don't render participants in collapsed state"
Closes #34366
See merge request gitlab-org/gitlab-ce!14270
2017-10-02 08:23:07 +00:00
147c46cca1
Merge branch '38052-use-simple-api-for-projects' into 'master'
...
Use `simple=true` for projects API in Projects dropdown for better search performance
Closes #38052
See merge request gitlab-org/gitlab-ce!14585
2017-10-02 07:39:07 +00:00
439e3f0735
Port semi-linear merge strategy to CE (mostly FE)
2017-09-29 14:13:35 -05:00
49fdaf9ee8
Merge branch 'hash-mr-scroll-load' into 'master'
...
Fixed anchored content not being scrolled into view
Closes #38326
See merge request gitlab-org/gitlab-ce!14562
2017-09-29 15:14:22 +00:00
4a17ac29b8
Use `simple=true` for projects API for better performance
2017-09-29 20:36:44 +05:30
5307844c9a
Merge branch 'dm-json-page-title' into 'master'
...
Use backend-provided page title in repo editor
Closes #36029
See merge request gitlab-org/gitlab-ce!13763
2017-09-29 13:22:27 +00:00
ef22b0dc81
Title has now its own test
2017-09-29 13:43:39 +02:00
705a840d2e
Not the Test will also work with other tests before
2017-09-29 12:02:43 +02:00
d729aa7383
spec fix
2017-09-29 09:40:21 +01:00
a481337b6a
Merge branch 'remove-target-dd' into 'master'
...
Remove target dd
Closes #38485
See merge request gitlab-org/gitlab-ce!14558
2017-09-29 08:33:10 +00:00
333cb069af
Fixed anchored content not being scrolled into view
...
Correctly scrolls anchored content into view when the user loads the
page. This is most obvious when the user loads a link note in a
merge request & the page does not scroll down to the note.
Closes #38326
2017-09-29 09:24:56 +01:00
0647484c61
Added Test for PageTitle / Removed Gitlab Part from TItle
2017-09-29 09:59:09 +02:00
5e850d5bae
Merge branch '38528-build-url' into 'master'
...
Fixes data parameter not being sent in ajax request for jobs log
Closes #38528
See merge request gitlab-org/gitlab-ce!14564
2017-09-29 07:52:13 +00:00
42218fcaa7
Fix karma test
2017-09-28 21:24:14 -04:00
3468ca835d
Merge branch 'master' into ff_port_from_ee
...
Conflicts:
app/models/project.rb
db/schema.rb
2017-09-28 16:59:49 -05:00
3d899a7d2e
Merge branch 'acet-repo-editor-prevent-extra-request' into 'master'
...
RepoEditor: Prevent extra network call for already opened files.
Closes #38256
See merge request gitlab-org/gitlab-ce!14489
2017-09-28 19:52:36 +00:00
2b407b9140
Fixes data parameter not being sent in ajax request for jobs log
2017-09-28 17:24:24 +01:00
cd5896ed7b
Merge branch 'jramsay-spelling-occurred' into 'master'
...
Fix spelling of occurred
See merge request gitlab-org/gitlab-ce!14488
2017-09-28 15:56:38 +00:00
9987aa0991
Merge remote-tracking branch 'origin/master' into 34366-issue-sidebar-don-t-render-participants-in-collapsed-state
2017-09-28 13:39:57 +01:00
ba76ddf281
Only trigger loadCheck on open toggle, not close. Update specs and add right_sidebar_spec test for additions
2017-09-28 13:29:32 +01:00
68269d7a40
issuable_context_spec review changes
2017-09-28 13:29:32 +01:00
baa08b5657
Finish issuable_context_spec
2017-09-28 13:29:32 +01:00
0690381080
Add issauble_context_spec
2017-09-28 13:29:32 +01:00
c25e83b536
RepoEditor: Prevent extra network call for already opened files.
2017-09-27 23:19:02 +03:00
e9f7d26f07
Merge branch 'acet-repo-editor-fix-link-linking' into 'master'
...
RepoEditor: Implement line and range linking.
Closes #38254
See merge request gitlab-org/gitlab-ce!14448
2017-09-27 17:23:16 +00:00
9034227749
Merge branch 'mr-side-by-side-breadcrumbs-container' into 'master'
...
Stop breadcrumbs changing container when in side-by-side diff
Closes #37641
See merge request gitlab-org/gitlab-ce!14454
2017-09-27 09:34:53 +00:00
6f9a6d37a9
Merge branch 'master' into ff_port_from_ee
2017-09-26 16:24:54 -05:00
a48c07da98
Use js- classes instead of Vue refs in tests for some perf
...
See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272#note_41419104
2017-09-26 14:43:54 -05:00
0ed23790a4
Fix spelling of occurred
2017-09-26 08:46:09 -04:00
b187a3f2bb
Merge branch 'changes-bar-dynamic-placeholder' into 'master'
...
Dynamically create offset for sticky bar
See merge request gitlab-org/gitlab-ce!14280
2017-09-26 11:09:42 +00:00
b524b9ebc7
Moves cycle analytics components into vue files
2017-09-26 10:47:19 +00:00
f9a212e8a3
Stop breadcrumbs changing container when in side-by-side diff
...
Closes #37641
2017-09-25 18:45:55 +01:00
1bdf47ab9d
Fix line_highlighter_spec.
2017-09-25 20:26:05 +03:00
1544bc3228
remove the sticky el from the test DOM after each test
2017-09-25 11:55:33 +01:00
f389f9081f
refactor tests to actually test browser behaviour
2017-09-25 11:40:40 +01:00
6c57d89468
Merge branch 'fly-out-nav-mousepos-error' into 'master'
...
Fixed fly-out error if mousePos array is empty
See merge request gitlab-org/gitlab-ce!14338
2017-09-25 09:29:20 +00:00
8ceaafae68
Removed old icons from project page
2017-09-22 16:50:07 +00:00
c4b2d1878a
Fixed fly-out error if mousePos array is empty
2017-09-22 17:13:46 +01:00
734bb73625
fixed and added specs for removing placeholder element
2017-09-22 11:13:19 +01:00
55f772bb98
Resolve "Better SVG Usage in the Frontend"
2017-09-22 08:39:47 +00:00
f22f75b752
Fix rendering double note issue.
2017-09-22 04:04:52 +03:00
137c5822ec
Merge branch 'acet-fix-comment-form-resize' into 'master'
...
IssueNotes: Resize comment form after note submit and discard.
Closes #38115
See merge request gitlab-org/gitlab-ce!14401
2017-09-21 20:41:58 +00:00
cca06da2e4
Standardize access to CSRF token in JavaScript
2017-09-21 17:53:28 +00:00
598b1a17a0
Merge branch '37220-es-modules' into 'master'
...
Use modules in common utils
See merge request gitlab-org/gitlab-ce!14074
2017-09-21 09:01:51 +00:00
d9a3bbce61
IssueNotes: Resize comment form after note submit and discard.
2017-09-21 03:08:17 +03:00
eebd99b2fc
Deleted another Fixture due to User Callout
2017-09-20 20:00:32 +02:00
2e08a13fff
Fixture Creation removed
2017-09-20 20:00:32 +02:00
dce15f2462
Deleted Karma Specs for userCallout
2017-09-20 20:00:32 +02:00
f2c23ab894
Use new shared Vue mountComponent method
2017-09-20 10:52:43 -05:00
Valery Sizov
Tim Zallmann
Eric Eastwood
Filipa Lacerda
kushalpandya
Jacob Schatz
Phil Hughes
Jacob Schatz
Luke "Jared" Bennett
Fatih Acet
James Ramsay
Bryce Johnson