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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 '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 'issue_13359' into 'master'	Jacob Schatz	2016-02-17	1	-10/+13
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-9/+12
\| \| \|
\| * \|	Change "opened by" to just "by"	Alfredo Sumaran	2016-02-16	1	-1/+1
\| \| \|
\| * \|	Move issue details after action buttons	Alfredo Sumaran	2016-02-15	1	-10/+10
\| \| \|
* \| \|	Merge branch 'bugfix/jschatz1/sidebar-fixes-13215' into 'master'	Jacob Schatz	2016-02-16	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \|
* \| \|	Merge branch 'fix/13356-issuable-index-of-total-in-sidebar' into 'master'	Douwe Maan	2016-02-16	1	-9/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \|
\| * \| \|	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	1	-10/+7
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \|	Eager-load image blob data in diffsfix/13458-eager-load-blob-data	Rémy Coutable	2016-02-16	1	-0/+2
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Since gitlab_git 8.0, blob data are lazy-loaded so we have to call blob.load_all_data!(repo) to eager-load them. Fixes #13458.
* \|	Merge branch 'fix/ci-emails-broken-link' into 'master'	Douwe Maan	2016-02-13	2	-2/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken link in CI build notification emails Closes #13199 See merge request !2785
\| * \|	Fix broken link in CI build notification emails	Grzegorz Bizon	2016-02-12	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #13199
* \| \|	Merge branch 'rs-issue-merge-requests' into 'master'	Douwe Maan	2016-02-12	1	-3/+3
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct indentation for `issues/merge_requests` partial render Prior, it would only be shown if the issue had been edited. See merge request !2789
\| * \|	Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requests	Robert Speicher	2016-02-11	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Prior, it would only be shown if the issue had been edited.
* \| \|	Don't show fork button if user can't fork the project.issue_13369	Rubén Dávila	2016-02-11	1	-8/+9
\| \| \|
* \| \|	Change MR link to "View Open Merge Request"display-mr-link-if-thre-is-one	Douglas Barbosa Alexandre	2016-02-10	2	-2/+2
\| \| \|
* \| \|	Replaces "Create merge request" link with one to the MR when one exists	Douglas Barbosa Alexandre	2016-02-10	2	-3/+7
\|/ /
* \|	Merge branch 'fix-explore-filter' into 'master'	Dmitriy Zaporozhets	2016-02-10	7	-21/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
\| * \|	Cleanup to use one selectorfix-explore-filter	Josh Frye	2016-02-09	4	-4/+4
\| \| \|
\| * \|	MR feedback	Josh Frye	2016-02-09	1	-1/+1
\| \| \|
\| * \|	Extract events rendering to own action.	Josh Frye	2016-02-09	2	-2/+2
\| \| \|
\| * \|	Starred, All, and Trending on explore are paged also group projects. Need ↵	Josh Frye	2016-02-09	2	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \|	ajax filter.
\| * \|	Fix explore filter. Fixes #13182	Josh Frye	2016-02-09	1	-8/+0
\| \| \|
* \| \|	Ensure link for README blobs includes the full pathrs-issue-13254	Robert Speicher	2016-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #13254
* \| \|	Merge branch 'variables-build-log' into 'master'	Robert Speicher	2016-02-09	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
\| * \| \|	Add information about expose of build variables.variables-build-log	Kamil Trzcinski	2016-02-09	1	-1/+3
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'fix-logo-rasterization' into 'master'	Robert Speicher	2016-02-09	1	-20/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent rasterization artifacts in the logo, and simplify markup. - Remove sketch-namespaced attributes. - Remove unused groups, and cancel out unnecessary transforms. - Use overlap to avoid rasterization artifacts in the logo. - Remove viewBox parameter and define paths in their final form. See merge request !2741
\| * \| \|	Prevent rasterization artefacts in the logo, and simplify markup.	Aaron Hamilton	2016-02-08	1	-20/+8
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove sketch-namespaced attributes. - Remove unused groups, and cancel out unnecessary transforms. - Use overlap to avoid rasterization artefacts in the logo. - Extend comment for `#logo` click event handler, as it's a non-obvious hack for Safari. - Remove viewBox parameter and define paths in their final form.
* \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-02-09	6	-12/+19
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Merge branch 'ci-permissions' into 'master'	Robert Speicher	2016-02-08	6	-12/+19
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
\| \| *	Remove current_user && when can? is used	Kamil Trzcinski	2016-02-05	2	-2/+2
\| \| \|
\| \| *	Merge branch 'master' into ci-permissions	Kamil Trzcinski	2016-02-05	35	-240/+287
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| \| * \	Merge remote-tracking branch 'origin/master' into ci-permissions	Kamil Trzcinski	2016-02-04	31	-176/+268
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/views/projects/builds/index.html.haml
\| \| * \| \|	Rename allow_guest_to_access_builds to public_builds	Kamil Trzcinski	2016-02-04	1	-4/+4
\| \| \| \| \|
\| \| * \| \|	Properly handle commit status permissions (for a build)	Kamil Trzcinski	2016-02-03	1	-4/+4
\| \| \| \| \|
\| \| * \| \|	Fix build errors	Kamil Trzcinski	2016-02-03	1	-1/+5
\| \| \| \| \|
\| \| * \| \|	Add CI setting: allow_guest_to_access_builds	Kamil Trzcinski	2016-02-02	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
\| \| * \| \|	Make the CI permission model simpler	Kamil Trzcinski	2016-02-02	5	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* \| \| \| \|	Merge branch ↵	Douwe Maan	2016-02-09	4	-0/+19
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' Add option to include the sender name in body of Notify email _Originally opened at !2495 by @huacnlee._ - - - Fixes #7824. See merge request !2767
\| * \| \| \| \|	Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail	Jason Lee	2016-02-09	4	-0/+19
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-tooltip-to-stuck-builds' into 'master'	Douwe Maan	2016-02-09	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a tooltip to the stuck warning build symbol We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 See merge request !2680