delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee	Valery Sizov	2017-10-02	7	-46/+190
\|\
\| *	Merge branch ↵	Tim Zallmann	2017-10-02	2	-43/+107
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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
\| \| *	Merge remote-tracking branch 'origin/master' into ↵	Luke "Jared" Bennett	2017-09-28	4	-31/+87
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	34366-issue-sidebar-don-t-render-participants-in-collapsed-state
\| \| * \|	Only trigger loadCheck on open toggle, not close. Update specs and add ↵	Luke "Jared" Bennett	2017-09-28	2	-43/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	right_sidebar_spec test for additions
\| \| * \|	issuable_context_spec review changes	Luke "Jared" Bennett	2017-09-28	1	-5/+5
\| \| \| \|
\| \| * \|	Finish issuable_context_spec	Luke "Jared" Bennett	2017-09-28	1	-10/+7
\| \| \| \|
\| \| * \|	Add issauble_context_spec	Luke "Jared" Bennett	2017-09-28	1	-0/+31
\| \| \| \|
\| * \| \|	Merge branch '38052-use-simple-api-for-projects' into 'master'	Tim Zallmann	2017-10-02	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `simple=true` for projects API in Projects dropdown for better search performance Closes #38052 See merge request gitlab-org/gitlab-ce!14585
\| \| * \| \|	Use `simple=true` for projects API for better performance	kushalpandya	2017-09-29	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'hash-mr-scroll-load' into 'master'	Filipa Lacerda	2017-09-29	1	-0/+56
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed anchored content not being scrolled into view Closes #38326 See merge request gitlab-org/gitlab-ce!14562
\| \| * \| \|	spec fixhash-mr-scroll-load	Phil Hughes	2017-09-29	1	-7/+3
\| \| \| \| \|
\| \| * \| \|	Fixed anchored content not being scrolled into view	Phil Hughes	2017-09-29	1	-0/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Merge branch 'dm-json-page-title' into 'master'	Jacob Schatz	2017-09-29	1	-0/+12
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use backend-provided page title in repo editor Closes #36029 See merge request gitlab-org/gitlab-ce!13763
\| \| * \| \| \|	Title has now its own testdm-json-page-title	Tim Zallmann	2017-09-29	1	-4/+11
\| \| \| \| \| \|
\| \| * \| \| \|	Not the Test will also work with other tests before	Tim Zallmann	2017-09-29	1	-3/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Added Test for PageTitle / Removed Gitlab Part from TItle	Tim Zallmann	2017-09-29	1	-0/+5
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'remove-target-dd' into 'master'	Filipa Lacerda	2017-09-29	1	-2/+0
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove target dd Closes #38485 See merge request gitlab-org/gitlab-ce!14558
\| \| * \| \|	Fix karma test	Jacob Schatz	2017-09-28	1	-2/+0
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch '38528-build-url' into 'master'	Phil Hughes	2017-09-29	1	-0/+14
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes data parameter not being sent in ajax request for jobs log Closes #38528 See merge request gitlab-org/gitlab-ce!14564
\| \| * \| \|	Fixes data parameter not being sent in ajax request for jobs log38528-build-url	Filipa Lacerda	2017-09-28	1	-0/+14
\| \| \|/ /
* \| \| \|	Port semi-linear merge strategy to CE (mostly FE)	Eric Eastwood	2017-09-29	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'master' into ff_port_from_ee	Eric Eastwood	2017-09-28	5	-9/+52
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/models/project.rb db/schema.rb
\| * \| \|	Merge branch 'acet-repo-editor-prevent-extra-request' into 'master'	Jacob Schatz	2017-09-28	1	-0/+14
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RepoEditor: Prevent extra network call for already opened files. Closes #38256 See merge request gitlab-org/gitlab-ce!14489
\| \| * \| \|	RepoEditor: Prevent extra network call for already opened files.acet-repo-editor-prevent-extra-request	Fatih Acet	2017-09-27	1	-0/+14
\| \| \|/ /
\| * \| \|	Merge branch 'jramsay-spelling-occurred' into 'master'	Jacob Schatz	2017-09-28	2	-3/+3
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Fix spelling of occurred See merge request gitlab-org/gitlab-ce!14488
\| \| * \|	Fix spelling of occurredjramsay-spelling-occurred	James Ramsay	2017-09-26	2	-3/+3
\| \| \| \|
\| * \| \|	Merge branch 'acet-repo-editor-fix-link-linking' into 'master'	Jacob Schatz	2017-09-27	1	-6/+12
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RepoEditor: Implement line and range linking. Closes #38254 See merge request gitlab-org/gitlab-ce!14448
\| \| * \| \|	Fix line_highlighter_spec.	Fatih Acet	2017-09-25	1	-6/+12
\| \| \| \| \|
\| * \| \| \|	Merge branch 'mr-side-by-side-breadcrumbs-container' into 'master'	Filipa Lacerda	2017-09-27	1	-0/+23
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop breadcrumbs changing container when in side-by-side diff Closes #37641 See merge request gitlab-org/gitlab-ce!14454
\| \| * \| \|	Stop breadcrumbs changing container when in side-by-side diffmr-side-by-side-breadcrumbs-container	Phil Hughes	2017-09-25	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #37641
* \| \| \| \|	Merge branch 'master' into ff_port_from_ee	Eric Eastwood	2017-09-26	20	-456/+555
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'changes-bar-dynamic-placeholder' into 'master'	Filipa Lacerda	2017-09-26	1	-24/+51
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dynamically create offset for sticky bar See merge request gitlab-org/gitlab-ce!14280
\| \| * \| \| \|	remove the sticky el from the test DOM after each testchanges-bar-dynamic-placeholder	Phil Hughes	2017-09-25	1	-2/+6
\| \| \| \| \| \|
\| \| * \| \| \|	refactor tests to actually test browser behaviour	Phil Hughes	2017-09-25	1	-48/+37
\| \| \| \| \| \|
\| \| * \| \| \|	fixed and added specs for removing placeholder element	Phil Hughes	2017-09-22	1	-3/+37
\| \| \|/ / /
\| * \| \| \|	Moves cycle analytics components into vue files	Filipa Lacerda	2017-09-26	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'fly-out-nav-mousepos-error' into 'master'	Filipa Lacerda	2017-09-25	1	-0/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed fly-out error if mousePos array is empty See merge request gitlab-org/gitlab-ce!14338
\| \| * \| \|	Fixed fly-out error if mousePos array is empty	Phil Hughes	2017-09-22	1	-0/+6
\| \| \|/ /
\| * \| \|	Removed old icons from project page	Phil Hughes	2017-09-22	1	-1/+1
\| \|/ /
\| * \|	Resolve "Better SVG Usage in the Frontend"	Tim Zallmann	2017-09-22	6	-1/+50
\| \| \|
\| * \|	Fix rendering double note issue.	Fatih Acet	2017-09-22	2	-10/+21
\| \|/
\| *	Merge branch 'acet-fix-comment-form-resize' into 'master'	Jacob Schatz	2017-09-21	1	-0/+14
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401
\| \| *	IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resize	Fatih Acet	2017-09-21	1	-0/+14
\| \| \|
\| * \|	Standardize access to CSRF token in JavaScript	Bryce Johnson	2017-09-21	1	-0/+49
\| \| \|
\| * \|	Merge branch '37220-es-modules' into 'master'	Phil Hughes	2017-09-21	5	-336/+363
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use modules in common utils See merge request gitlab-org/gitlab-ce!14074
\| \| * \	Merge branch 'master' into 37220-es-modules	Mike Greiling	2017-09-18	2	-1/+10
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (148 commits) Remove gaps under nav on build page Replace the 'project/snippets.feature' spinach test with an rspec analog Use correct group members path for members flyout link Replace the 'project/commits/revert.feature' spinach test with an rspec analog Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0' Replace the 'project/archived.feature' spinach test with an rspec analog Fix broken link in docs/api/wiki.md Fixed the new sidebars width when browser has scrollbars Improve 'spec/features/profiles/*' specs Replace the 'search.feature' spinach test with an rspec analog dedupe yarn packages add dependency approvals (all MIT license) update build image to latest with node 8.x, yarn 1.0.2, and chrome 61 Ensure we use `Entities::User` for non-admin `users/:id` API requests Minor update to address Sean McGivern's comment. Add data migration Fix setting share_with_group_lock created services for keys Prepare Repository#merge for migration to Gitaly Never connect to webpack-dev-server over SSL ...
\| \| * \| \|	fixed mr widget options spec	Phil Hughes	2017-09-13	1	-3/+2
\| \| \| \| \|
\| \| * \| \|	fixed todos spec	Phil Hughes	2017-09-12	1	-17/+9
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into 37220-es-modules	Filipa Lacerda	2017-09-12	1	-25/+0
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (35 commits) Use WikiPages::CreateService in spec/features/projects/wiki/user_updates_wiki_page_spec.rb Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog Docs group mrs list view search bar Replace the project/milestone.feature spinach test with an rspec analog Make all the tooltips in the same direction on the commit info box Reset all connection schema cache after migration tests Emoji was rendered as italic Adds Event polyfill for IE Add gitaly to patch update doc Document how to swap database tables. Replace 'project/wiki.feature' spinach test with an rspec analog Check for sidebar cookie instead of class when resizing window update installation and update instructions for 10.0 Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog Remove confidential toggle checkbox and related code as no longer necessary Bump grape_logging gem to 1.7.0 to get status codes for error messages Expand filtered parameters to include `token` Replace the project/team_management.feature spinach test with an rspec analog Replace the profile/emails.feature spinach test with an rspec analog Replace project/group_links.feature spinach test with an rspec analog ...
\| \| * \| \| \|	fixed location.pathname not being reset	Phil Hughes	2017-09-12	1	-1/+1
\| \| \| \| \| \|