7dbdc9837c
Merge branch 'dm-copy-parallel-diff' into 'master'
...
Only copy old/new code when selecting left/right side of parallel diff
See merge request gitlab-org/gitlab-ce!14561
2017-10-03 09:44:38 +00:00
0ac06c89e9
Merge branch 'ff_port_from_ee' into 'master'
...
Move Fast-Forward Merge to CE
See merge request gitlab-org/gitlab-ce!14272
2017-10-03 08:24:31 +00:00
b74c643c66
Only copy old/new code when selecting left/right side of parallel diff
2017-10-02 18:39:25 +02:00
28ea45f978
Merge branch '38619-fix-comment-delete-confirm-text' into 'master'
...
Fix typo in comment deletion confirmation dialog
Closes #38619
See merge request gitlab-org/gitlab-ce!14622
2017-10-02 11:06:34 +00:00
17758dddf7
Merge branch 'translation-timeago-a-while-ago' into 'master'
...
Fix translation for 'a while' => 'in a while'
See merge request gitlab-org/gitlab-ce!14433
2017-10-02 10:16:33 +00:00
a0ac2d932c
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee
2017-10-02 13:15:46 +03:00
3197f415c8
Fix comment deletion confirmation dialog typo
2017-10-02 16:42:35 +07:00
b4d6bbf450
Remove global components
2017-10-02 09:01:55 +00: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
aedcaba494
Fix incorrectly aligned last updated time
2017-09-29 14:16:13 -04:00
c49d19a5dc
Merge branch 'fork-btn-enabled-user-groups' into 'master'
...
Fix fork button being disabled for users who can fork to group
Closes #38462
See merge request gitlab-org/gitlab-ce!14551
2017-09-29 15:55:14 +00:00
0e82f6d38d
Merge branch '38582-popover-badge' into 'master'
...
Improves UX of autodevops popover to match gpg one
Closes #38582
See merge request gitlab-org/gitlab-ce!14582
2017-09-29 15:30:56 +00: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
66775a8083
Merge branch 'icons-update-nav-bars' into 'master'
...
Updated All Navigation Icons to Sprite_Icons
See merge request gitlab-org/gitlab-ce!14559
2017-09-29 13:32:17 +00:00
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
387975fe1a
Improves UX of autodevops popover to match gpg one
2017-09-29 14:07:43 +01:00
5c17fe58fb
FIxed the clearing icon + jumping of fluid nav bar
2017-09-29 12:41:00 +02:00
705a840d2e
Not the Test will also work with other tests before
2017-09-29 12:02:43 +02:00
8585ae61e7
Fix fork button being disabled for users who can fork to group
...
Previously the fork button was disabled for all users if they have
exceeded their project limit. This fixes that by changing the check
to see if the user can fork to a group instead of their own namespace.
This behaviour is already possible by visiting the new fork page
directly, so this just fixes the button being disabled.
Closes #38462
2017-09-29 10:51:26 +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
a94f2ea915
Fix static analysis.
2017-09-28 21:38: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
c8596aa915
Add period to multi-sentence rebase locally message
...
See https://gitlab.com/gitlab-org/gitlab-ce/issues/38251
2017-09-28 10:46:43 -05:00
e0df4a9eb1
Removes the target branch and only uses the source branch.
2017-09-28 10:05:38 -04: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
ae36ee6a14
Conditionally call loadCheck if lazyLoader is present
2017-09-28 13:29:32 +01:00
94749a45b7
Trigger load of lazy images when opening sidebar, or clicking 'more participants'
2017-09-28 13:29:32 +01:00
afb1e004fc
Merge branch 'mobile-images-lazy-load-check' into 'master'
...
Lazy load images in mobile sidebar & header
Closes #38276
See merge request gitlab-org/gitlab-ce!14526
2017-09-28 10:53:33 +00:00
023a61505c
Merge branch 'commit-side-by-side-comment' into 'master'
...
Fixes commit comments in parallel diff view
Closes #38117
See merge request gitlab-org/gitlab-ce!14529
2017-09-28 10:11:12 +00:00
11c8b8bc3c
Merge branch 'rotated_profile_image' into 'master'
...
Check orientation of profile image
See merge request gitlab-org/gitlab-ce!14461
2017-09-28 06:33:26 +00:00
c25e83b536
RepoEditor: Prevent extra network call for already opened files.
2017-09-27 23:19:02 +03:00
36cd266a14
Merge branch 'winh-linting-locale' into 'master'
...
Fix linting errors in locale/index.js
See merge request gitlab-org/gitlab-ce!14521
2017-09-27 18:21:39 +00: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
35ac2fbf0a
karma spec fixes
2017-09-27 17:14:06 +01:00
d2f96827b0
Check orientation of profile image
2017-09-27 14:55:15 +00:00
fe24c0a875
Fixes commit comments in side-by-side diff view
...
This was caused by the `notes` global class not existing when the
`file_comment_button` code is run. The notes class was used to check
if the diff is currently in parallel view or not. To get around this
I've added a check into the `file_comment_button` JS to check if the
view is currently parallel or not.
Closes #38117
2017-09-27 15:38:13 +01:00
c940fe2ad9
Lazy load images in mobile sidebar & header
...
Closes #38276
2017-09-27 14:37:44 +01:00
0612ee64bc
Fix linting errors in locale/index.js
2017-09-27 13:55:41 +02: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
Phil Hughes
Sean McGivern
Douwe Maan
Filipa Lacerda
Douwe Maan
Valery Sizov
Mark Fletcher
Tim Zallmann
Eric Eastwood
James Ramsay
kushalpandya
Jacob Schatz
Jacob Schatz
Luke "Jared" Bennett
Fatih Acet
Guilherme Vieira
Winnie Hellmann