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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Simplify install and update sectiongitlab_intro_docs	Achilleas Pipinellis	2016-03-19	1	-5/+2
\| \| \| \|	[ci skip]
*	Add h1 heading	Achilleas Pipinellis	2016-03-19	1	-0/+2
\|
*	Add more options and missing links	Achilleas Pipinellis	2016-03-19	1	-10/+12
\| \| \| \|	[ci skip]
*	Merge branch 'master' into gitlab_intro_docs	Achilleas Pipinellis	2016-03-19	333	-5274/+5171
\|\
\| *	Merge branch 'master' into 'master'	Achilleas Pipinellis	2016-03-19	1	-0/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about `image` and `services` field at `job` level in the `.gitlab-ci.yml` documentation Fixes #14366 /cc @tmaczukin @ayufan @axil See merge request !3277
\| \| *	fixed md anchor link	Pat Turner	2016-03-18	1	-2/+2
\| \| \|
\| \| *	Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366	Pat Turner	2016-03-18	1	-2/+2
\| \| \|
\| \| *	removed anchor as unsupported in markdown	Pat Turner	2016-03-17	1	-2/+2
\| \| \|
\| \| *	Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/14366	Pat Turner	2016-03-17	1	-0/+2
\| \| \|
\| * \|	Merge branch 'fix/14418' into 'master'	Robert Speicher	2016-03-18	3	-23/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dedupe labels in labels selector in Dashboard pages Fixes #14418. See merge request !3311
\| \| * \|	Dedupe labels in labels selector in Dashboard pagesfix/14418	Rémy Coutable	2016-03-18	3	-23/+9
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Also moved useless helper methods and directly to the DashboardController.
\| * \|	Merge branch 'no-gc-retry' into 'master'	Robert Speicher	2016-03-18	3	-3/+13
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not retry "git gc" To prevent 'git gc' timing out on a large repo and then bouncing around in the retry queue. See merge request !3266
\| \| * \|	Fix HousekeepingService testsno-gc-retry	Jacob Vosmaer	2016-03-18	1	-2/+2
\| \| \| \|
\| \| * \|	Do not retry "git gc"	Jacob Vosmaer	2016-03-17	2	-1/+11
\| \| \| \|
\| * \| \|	Merge branch 'fix/14388' into 'master'	Douwe Maan	2016-03-18	3	-1/+27
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an issue when the target branch of a MR had been deleted Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388. See merge request !3294
\| \| * \| \|	Add a safeguard in MergeRequest#compute_diverged_commits_count	Rémy Coutable	2016-03-18	3	-2/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We have to ensure source_sha and target_sha are not nil before calling Gitlab::Git::Commit.between.
\| \| * \| \|	Fix an issue when the target branch of a MR had been deleted	Rémy Coutable	2016-03-18	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388.
\| * \| \| \|	Merge branch 'refactor-ui-lists' into 'master'	Dmitriy Zaporozhets	2016-03-18	14	-76/+61
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor colors and lists * Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3307
\| \| * \| \|	Refactor colors and lists	Dmitriy Zaporozhets	2016-03-18	14	-76/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Introduce 2 color links: black and blue * Use black color link for UI elements like lists * Refactor lists to use .title nested under li * Make all lists (events, todos, activity, projects etc) use style * List colorschema is now 333 for links and 555 for text Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'add_avatar_to_issue_mr_header' into 'master'	Jacob Schatz	2016-03-18	2	-4/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add avatar to issue and MR pages header closes #14395 # For Issues ### Before ![Screen_Shot_2016-03-18_at_4.27.25_PM](/uploads/b097c8e304c9737e2f46ee25667829bf/Screen_Shot_2016-03-18_at_4.27.25_PM.png) ### After ![Screen_Shot_2016-03-18_at_4.22.10_PM](/uploads/f7d2b12c9455950c2e660b33e27c1827/Screen_Shot_2016-03-18_at_4.22.10_PM.png) # For Merge Request ### Before ![Screen_Shot_2016-03-18_at_4.27.09_PM](/uploads/50c7b6ee346f749f448647004ae6031b/Screen_Shot_2016-03-18_at_4.27.09_PM.png) ### After ![Screen_Shot_2016-03-18_at_4.24.17_PM](/uploads/abd37ccf030e0b6d10521a6937206de6/Screen_Shot_2016-03-18_at_4.24.17_PM.png) See merge request !3301
\| \| * \| \| \|	Add avatar to issue and MR pages headeradd_avatar_to_issue_mr_header	Arinde Eniola	2016-03-18	2	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'refactor-variables' into 'master'	Dmitriy Zaporozhets	2016-03-18	4	-33/+64
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor variables Fixes #13803 and other color inconsistency across application cc @jschatz1 @skyruler See merge request !3304
\| \| * \| \| \|	Cleanup somce css colors	Dmitriy Zaporozhets	2016-03-18	4	-20/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Re-group scss variables	Dmitriy Zaporozhets	2016-03-18	1	-21/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master'	Douwe Maan	2016-03-18	11	-45/+187
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trigger a todo for mentions on commits page Closes #14006 * Screenshot: ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png) See merge request !3262
\| \| * \| \| \| \|	Refactor `Todo#target`	Douglas Barbosa Alexandre	2016-03-18	2	-12/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Rename `Todo#to_reference` to `Todo#target_reference`	Douglas Barbosa Alexandre	2016-03-18	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we're not actually returning a todo reference.
\| \| * \| \| \| \|	Update CHANGELOGtrigger-todo-for-mentions-on-commits-page	Douglas Barbosa Alexandre	2016-03-18	1	-0/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use `Note#for_project_snippet?` to skip notes on project snippet	Douglas Barbosa Alexandre	2016-03-18	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use `Commit#short_id` instead of `Commit.truncate_sha`	Douglas Barbosa Alexandre	2016-03-18	2	-2/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Reuse `for_commit?` on conditional validations	Douglas Barbosa Alexandre	2016-03-18	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update schema info comment on todo related files	Douglas Barbosa Alexandre	2016-03-18	3	-6/+9
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Use todo.done without ! in the controller to mark todo as done	Douglas Barbosa Alexandre	2016-03-18	3	-6/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Trigger a todo for mentions on commits page	Douglas Barbosa Alexandre	2016-03-18	6	-32/+149
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add commit_id to todos	Douglas Barbosa Alexandre	2016-03-18	2	-0/+8
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Change target_id to null on todos	Douglas Barbosa Alexandre	2016-03-18	2	-1/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'filter-label-missing' into 'master'	Robert Speicher	2016-03-18	6	-9/+9
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with filter label missing on labels & milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14407 See merge request !3297
\| \| * \| \| \| \|	Fixes issue with filter label missing on labels & milestones	Phil Hughes	2016-03-18	6	-9/+9
\| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'rs-issue-14259' into 'master'	Robert Speicher	2016-03-18	1	-2/+4
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent a 500 when a repository's root_ref is nil Closes #14259 See merge request !3278
\| \| * \| \| \|	Prevent a 500 when a repository's root_ref is nilrs-issue-14259	Robert Speicher	2016-03-17	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14259
\| * \| \| \| \|	Merge branch 'dashboard-labels' into 'master'	Robert Speicher	2016-03-18	12	-94/+113
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dashboard labels Previously because there were no JSON endpoint for labels or milestones it was fetching HTML and parsing that. This is wrong. It now fetches from a JSON endpoint. This also fixes the dashboard/issues page not loading labels or milestones as the path used to be only for a single project. So instead I have created a endpoint for labels & milestones JSON on dashboard. See merge request !3253
\| \| * \| \| \| \|	Fixed failing tests	Phil Hughes	2016-03-18	2	-7/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Updated controller with before_action	Phil Hughes	2016-03-18	5	-10/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed other issues based on feedback
\| \| * \| \| \| \|	Fixes issue on dashboard issues	Phil Hughes	2016-03-18	7	-67/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They would try to load JSON from a project even though it isn't a single project
\| \| * \| \| \| \|	Full labels data in JSON	Phil Hughes	2016-03-18	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fixed issue with labels dropdown getting wrong labels	Phil Hughes	2016-03-18	5	-20/+17
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'fix-mr-close-button' into 'master'	Jacob Schatz	2016-03-18	2	-2/+10
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with close button not working on MR Closes #14383 See merge request !3295
\| \| * \| \| \|	Added test	Phil Hughes	2016-03-18	1	-0/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Fixes issue with close button not working on MRfix-mr-close-button	Phil Hughes	2016-03-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14383
\| * \| \| \| \|	Merge branch 'improved-issue-sidebar' into 'master'	Jacob Schatz	2016-03-18	5	-89/+145
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved issue sidebar Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row. Closes #13353 See merge request !3097