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

	Commit message (Collapse)	Author	Age	Files	Lines
*	How to add an example.example-java	Sytse Sijbrandij	2016-02-17	1	-0/+6
\|
*	Add java example	Sytse Sijbrandij	2016-02-17	1	-0/+4
\|
*	Merge branch 'bugfix/jschatz1/milestone-icon' into 'master'	Rémy Coutable	2016-02-17	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Correct icon for milestones. See merge request !2856
\| *	Correct icon for milestones.bugfix/jschatz1/milestone-icon	Jacob Schatz	2016-02-17	1	-1/+1
\| \|
* \|	Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' ↵	Douwe Maan	2016-02-17	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Sort line notes used in parallel diff by created_at Fixes #13464. See merge request !2858
\| * \|	Sort line notes used in parallel diff by created_at	Rémy Coutable	2016-02-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #13464.
* \| \|	Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master'	Douwe Maan	2016-02-17	3	-3/+25
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redirect /import to project page if no importing at all and repo exists Fixes gitlab-org/gitlab-ce#13367. See merge request !2857
\| * \|	Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-import	Rémy Coutable	2016-02-17	3	-3/+25
\| \|/ \| \| \| \| \| \|	Fixes #13367.
* \|	Merge branch 'rs-issue-13469' into 'master'	Douwe Maan	2016-02-17	2	-9/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
\| * \|	Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469	Robert Speicher	2016-02-15	2	-9/+14
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #13469
* \| \|	Merge branch 'expire-fork-import-caches' into 'master'	Douwe Maan	2016-02-17	7	-1/+74
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expire caches after forking/importing a repository cc @dblessing @DouweM Related issue: gitlab-org/gitlab-ce#13505 See merge request !2838
\| * \| \|	Flush all repository caches when deleting a repoexpire-fork-import-caches	Yorick Peterse	2016-02-17	2	-1/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that _all_ caches (including any caches normally only flushed under certain conditions) are flushed whenever a project is removed. Because cache keys are based on project namespaces (excluding IDs) not doing so could result in a newly created project re-using old caches (if the project was re-created using the same name).
\| * \| \|	Expire caches after forking/importing a repository	Yorick Peterse	2016-02-17	6	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the caches for Repository#empty? and Repository#has_visible_content? are flushed after a repository has been imported or forked. Fixes gitlab-org/gitlab-ce#13505
* \| \| \|	Merge branch 'image-diff' into 'master'	Douwe Maan	2016-02-17	3	-11/+18
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes for showing images - Render scrubbed SVG's inline, not via /raw/ - Use /raw/ requests on image diffs Both of these are needed because of no longer eager loading blobs. This a follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2830 Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/13350 See merge request !2837
\| * \| \| \|	Fixes requested by Rémyimage-diff	Jacob Vosmaer	2016-02-17	2	-4/+5
\| \| \| \| \|
\| * \| \| \|	No use to sanitize partial blob data	Jacob Vosmaer	2016-02-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Use /raw/ requests for image diffs	Jacob Vosmaer	2016-02-16	1	-9/+9
\| \| \| \| \|
\| * \| \| \|	Fix SVG blob rendering	Jacob Vosmaer	2016-02-16	1	-1/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' ↵	Douwe Maan	2016-02-17	2	-4/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix a bug preventing from doing subsequent edits in any Issuable sidebar Fixes #13517. Fixes #12572. ### Issue ![impossible-subsequent-issue-edits-in-sidebar](/uploads/bd45c0effb46848641932d9cd38d3fe2/impossible-subsequent-issue-edits-in-sidebar.gif) --- ### Merge request ![impossible-subsequent-mr-edits-in-sidebar](/uploads/b4e1e3e93df4ac0a3d962df8b6139de9/impossible-subsequent-mr-edits-in-sidebar.gif) /cc @jschatz1 @sytses See merge request !2848
\| * \| \| \| \|	Fix a bug preventing from doing subsequent edits in any Issuable sidebarfix/13517-impossible-subsequent-issuable-edits-in-sidebar	Rémy Coutable	2016-02-17	2	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'klowner/gitlab-ce-fix-compare-by-tag-crash' into 'master'	Douwe Maan	2016-02-17	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error when comparing by tags _Originally opened at !2787 by @klowner._ - - - Fixes #13171. Fixes #13370. See merge request !2849
\| * \| \| \| \| \|	Fix 500 error when comparing by tags	Mark Riedesel	2016-02-17	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bugfix/jschatz1/sidebar/02-16-16' into 'master'	Douwe Maan	2016-02-17	1	-0/+16
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix double scrollbar issues Sidebar double scrollbar issue fix. ![Screen_Shot_2016-02-16_at_9.22.49_PM](/uploads/cb950eda08ed5d3b4a6c6979c977e029/Screen_Shot_2016-02-16_at_9.22.49_PM.png) See merge request !2851
\| * \| \| \| \| \|	Fix double scrollbar issues	Jacob Schatz	2016-02-17	1	-0/+16
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'issue_13359' into 'master'	Jacob Schatz	2016-02-17	2	-10/+21
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevents floated button group on issues view Issue #13359 ![screenshot](/uploads/962ac4f3f1f3d6ef87f7152c09090801/screenshot.jpg) See merge request !2826
\| * \| \| \| \|	Wrap issue details to prevent content misalignmentissue_13359	Alfredo Sumaran	2016-02-16	2	-9/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Change "opened by" to just "by"	Alfredo Sumaran	2016-02-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Prevent author name to split into multiple lines	Alfredo Sumaran	2016-02-15	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Prevent split time into multiple lines for better reading	Alfredo Sumaran	2016-02-15	1	-0/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Move issue details after action buttons	Alfredo Sumaran	2016-02-15	1	-10/+10
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'update-allocations' into 'master'	Yorick Peterse	2016-02-17	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the allocations Gem to 1.0.4 Sometimes the output of Allocations.to_hash may contain garbage. See https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce for more information. See merge request !2816
\| * \| \| \| \|	Updated the allocations Gem to 1.0.4update-allocations	Yorick Peterse	2016-02-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes the output of Allocations.to_hash may contain garbage. See https://gitlab.com/gitlab-org/allocations/commit/15d3a39f51392013dcf5f88dd21fab31201350ce for more information.
* \| \| \| \| \|	Merge branch 'spec_fix' into 'master'	Douwe Maan	2016-02-17	1	-0/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Award Emoji]: sporadic spec fix See merge request !2833
\| * \| \| \| \|	sporadic spec fixspec_fix	Valery Sizov	2016-02-16	1	-0/+2
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'doc-ci-variables-readme-fix' into 'master'	Robert Speicher	2016-02-16	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix table in doc/ci/variables/README.md The table was missing a column separator, causing GitLab to render the markdown incorrectly. [ci skip] See merge request !2840
\| * \| \| \| \|	fix table in doc/ci/variables/README.md	Richard Hansen	2016-02-16	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'redis_installation' into 'master'	Achilleas Pipinellis	2016-02-16	2	-15/+70
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Redis installation guide See merge request !2839
\| * \| \| \| \|	Fix Redis installation guide	Achilleas Pipinellis	2016-02-16	2	-15/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master'	Jacob Schatz	2016-02-16	2	-1/+26
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sidebar fixes Fixes #13215 * when editing a dropdown, but not changing anything you end up in an ugly state * the hover-over state for the subscribe and other buttons are veeery subtle * the collapse button needs some sort of hover-over state * the reference gets shortened. It always got shortened. Not an issue with this in particular. * the minimized sidebar is not functional. The copy button doesn't do anything * looks all funky in safari (not for me) See merge request !2736
\| * \| \| \| \|	Make copy button in collapsed sidebar work.bugfix/jschatz1/sidebar-fixes-13215	Jacob Schatz	2016-02-05	2	-1/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Fix span margin issues	Jacob Schatz	2016-02-05	1	-1/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Add hover for gutter toggle button	Jacob Schatz	2016-02-05	1	-5/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Change hover color of sidebar buttons	Jacob Schatz	2016-02-05	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Fix ugly state of dropdown	Jacob Schatz	2016-02-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when editing a dropdown, but not changing anything you end up in an ugly state Fixes #13215
* \| \| \| \| \|	Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master'	Douwe Maan	2016-02-16	12	-98/+309
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - What does this MR do? Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) Are there points in the code the reviewer needs to double check? 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 Why was this MR needed? More information about user for push events, and more data about repositiry ( project ) What are the relevant issue numbers? No Screenshots (if relevant) No See merge request !2788
\| * \| \| \| \| \|	Use project.web_url instead deprecated repository.homepage in PushoverService	Rémy Coutable	2016-02-16	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooks	Kirill Zaitsev	2016-02-11	11	-97/+308
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
* \| \| \| \| \|	Merge branch 'fix/13356-issuable-index-of-total-in-sidebar' into 'master'	Douwe Maan	2016-02-16	8	-95/+84
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the "x of y" displayed at the top of Issuables' sidebar 1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 1. Also, refactored a bit the Issuable helpers into a new `IssuablesHelper` module. 1. Added acceptance specs for the sidebar counter. Note: I didn't add a CHANGELOG item since it's a bug fix for an unreleased version. Fixes #13356. See merge request !2818
\| * \| \| \| \| \|	Display "iid of max_iid" in Issuables' sidebar	Rémy Coutable	2016-02-16	3	-19/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebar	Rémy Coutable	2016-02-15	9	-96/+99
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper module. 3. Added acceptance specs for the sidebar counter.