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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added text_utility to JS testsmarkdowner	Phil Hughes	2016-06-20	1	-6/+7
\|
*	Made markdown buttons work on all markdown textareas	Phil Hughes	2016-06-17	4	-24/+27
\| \| \| \|	Selecting multiple rows & a list correctly creates the selected text into a list
*	Improved design	Phil Hughes	2016-06-17	1	-105/+43
\| \| \| \|	Updated JS to remove undo manager - instead let the browser handle it all
*	Updated design of markdown buttons	Phil Hughes	2016-06-17	3	-24/+48
\|
*	Make tests pass.	Jacob Schatz	2016-06-17	1	-1/+1
\|
*	Fix spec issue	Jacob Schatz	2016-06-17	1	-1/+1
\|
*	Move buttons to upper right.	Jacob Schatz	2016-06-17	4	-13/+30
\|
*	Revert _form file	Jacob Schatz	2016-06-17	1	-2/+3
\|
*	Fix syntax error. Remove whitespace	Jacob Schatz	2016-06-17	1	-2/+2
\|
*	Proper class jquery selector for `off`.	Jacob Schatz	2016-06-17	1	-1/+1
\|
*	No need to add bold for the class selector for removing events	Jacob Schatz	2016-06-17	1	-1/+1
\|
*	Remove console.log	Jacob Schatz	2016-06-17	1	-4/+5
\|
*	Add undo history once they click the enter or backspace key	Jacob Schatz	2016-06-17	1	-1/+12
\|
*	Add redo state	Jacob Schatz	2016-06-17	1	-0/+3
\|
*	Overwrite undo history	Jacob Schatz	2016-06-17	3	-5/+51
\|
*	Initial markdown ez buttons	Jacob Schatz	2016-06-17	1	-2/+1
\|
*	Initial markdown ez buttons	Jacob Schatz	2016-06-17	4	-0/+93
\|
*	Merge branch '18709-use-specific-git-cached-counters' into 'master'	Yorick Peterse	2016-06-17	3	-3/+4
\|\ \| \| \| \| \| \| \| \|	Use Git cached counters on project show page See merge request !4711
\| *	Use Git cached counters on project show page18709-use-specific-git-cached-counters	Paco Guzman	2016-06-16	3	-3/+4
\| \| \| \| \| \| \| \|	Besides when building the repository cache we cache those git counters too
* \|	Merge branch 'rs-devise-emails' into 'master'	Robert Speicher	2016-06-17	10	-20/+81
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Customize all Devise mails Continuing from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3354 See merge request !4297
\| * \|	Center the header logo for all Devise emails	Robert Speicher	2016-06-16	2	-0/+5
\| \| \|
\| * \|	Add previews for all customized Devise emails	Robert Speicher	2016-06-16	1	-2/+21
\| \| \|
\| * \|	Customize the Devise `unlock_instructions` email	Robert Speicher	2016-06-16	2	-10/+16
\| \| \|
\| * \|	Customize the Devise `reset_password_instructions` email	Robert Speicher	2016-06-16	3	-8/+22
\| \| \|
\| * \|	Customize the Devise `password_change` emails	Robert Speicher	2016-06-16	2	-0/+17
\| \| \|
* \| \|	Merge remote-tracking branch 'dev/master'	Robert Speicher	2016-06-16	1	-0/+7
\|\ \ \
\| * \ \	Merge branch 'confidential-issue-notes' into 'master'	Robert Speicher	2016-06-16	1	-0/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project members with guest role can't access notes on confidential issues Related issues: - https://gitlab.com/gitlab-org/gitlab-ce/issues/18535 - https://gitlab.com/gitlab-org/gitlab-ce/issues/14787 See merge request !1971
\| \| * \| \|	Project members with guest role can't access notes on confidential issues	Douglas Barbosa Alexandre	2016-06-14	1	-0/+7
\| \| \| \| \|
* \| \| \| \|	Update CHANGELOG for !4659	Robert Speicher	2016-06-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch 'remove_jiraissue' into 'master'	Robert Speicher	2016-06-17	7	-39/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove JiraIssue model and replace references with ExternalIssue This MR Removes unused JiraIssue class and replaces references with ExternalIssue Closes #18203 See merge request !4659
\| * \| \| \| \|	Remove JiraIssue model and replace references with ExternalIssue	Ilan Shamir	2016-06-16	7	-39/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add_autocomplete_for_labels' into 'master'	Robert Speicher	2016-06-17	4	-0/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add GFM autocomplete for labels Closes #14637 See merge request !4013
\| * \| \| \| \| \|	Updated CHANGELOG and template.add_autocomplete_for_labels	Fatih Acet	2016-06-14	2	-3/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Fatih Acet	2016-06-14	1898	-12371/+35104
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add_autocomplete_for_labels # Conflicts: # app/assets/javascripts/gfm_auto_complete.js.coffee
\| * \| \| \| \| \| \|	add entry to CHANGELOG	Arinde Eniola	2016-05-03	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add gfm autocomplete for labels	Arinde Eniola	2016-05-03	3	-0/+30
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-project-find-with-namespace-order' into 'master'	Robert Speicher	2016-06-17	2	-2/+34
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed ordering in Project.find_with_namespace This MR fixes the ordering of `Project.find_with_namespace` to ensure that it returns rows that match literally first. Closes #18603 See merge request !4682
\| * \| \| \| \| \| \| \|	Fixed ordering in Project.find_with_namespacefix-project-find-with-namespace-order	Yorick Peterse	2016-06-16	2	-2/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures that Project.find_with_namespace returns a row matching literally as the first value, instead of returning a random value. The ordering here is _only_ applied to Project.find_with_namespace and _not_ Project.where_paths_in as currently there's no code that requires Project.where_paths_in to return rows in a certain order. Since this method also returns all rows that match there's no real harm in not setting a specific order either. Another reason is that generating all the "WHEN" arms for multiple values in Project.where_paths_in becomes really messy. On MySQL we have to use the "BINARY" operator to turn a "WHERE" into a case-sensitive WHERE as otherwise MySQL may still end up returning rows in an unpredictable order. Fixes gitlab-org/gitlab-ce#18603
* \| \| \| \| \| \| \| \|	Merge branch 'bump-gitlab-git-10.2.0' into 'master'	Robert Speicher	2016-06-17	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitlab-git 10.2.0 Closes #18741 See merge request !4722
\| * \| \| \| \| \| \| \|	Use gitlab-git 10.2.0bump-gitlab-git-10.2.0	Stan Hu	2016-06-16	2	-3/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'banzai-issue-filter-queries' into 'master'	Douwe Maan	2016-06-16	5	-7/+139
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce SQL query counts in IssueReferenceFilter ## What does this MR do? This MR adds a preparation phase for reference filters that allows them to prepare/create data structures used while iterating over HTML nodes. In this particular case the preparation phase is used for issue references to greatly cut down the amount of queries executed to get projects/issues for Markdown references. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Rendering Markdown containing issue references would run at most two queries for every issue reference: one to get the project and one to get the issue from said project. When rendering Markdown with lots of issue references this would result in _a lot_ of queries being executed. ## What are the relevant issue numbers? #18042 See merge request !4410
\| * \| \| \| \| \| \| \|	Reduce queries in IssueReferenceFilterbanzai-issue-filter-queries	Yorick Peterse	2016-06-16	5	-7/+139
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces the number of queries executed in IssueReferenceFilter by retrieving the various projects/issues that may be referenced in batches _before_ iterating over all the HTML nodes. A chunk of the logic resides in AbstractReferenceFilter so it can be re-used by other filters in the future.
* \| \| \| \| \| \| \| \|	Merge branch 'tree-file-title' into 'master'	Jacob Schatz	2016-06-16	2	-5/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added title attribute to entries in tree view ## What does this MR do? Adds a title attribute to entries in the tree view. Moe useful when files have long names. ## What are the relevant issue numbers? Closes #18353 See merge request !4709
\| * \| \| \| \| \| \| \| \|	Added title attribute to enties in tree viewtree-file-title	Phil Hughes	2016-06-16	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18353
* \| \| \| \| \| \| \| \| \|	Merge branch 'merge-request-default-source-branch-text' into 'master'	Jacob Schatz	2016-06-16	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added source branch text to dropdown toggle ## What does this MR do? Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch" ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_12.20.10](/uploads/40d31e21297a99300050cf9f23bd7371/Screen_Shot_2016-06-07_at_12.20.10.png) See merge request !4504
\| * \| \| \| \| \| \| \| \| \|	CHANGELOGmerge-request-default-source-branch-text	Phil Hughes	2016-06-16	1	-13/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	CHANGELOG	Phil Hughes	2016-06-16	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \| \|	Added source branch text to dropdown toggle	Phil Hughes	2016-06-16	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch"
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'media-query-bug' into 'master'	Jacob Schatz	2016-06-16	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project header alignment media query bug ## What does this MR do? Fixes media query bug on project header ## Screenshots (if relevant) ![Screen_Shot_2016-06-15_at_3.22.20_PM](/uploads/3d84f8ffb88c316f317048e15ffea4f3/Screen_Shot_2016-06-15_at_3.22.20_PM.png) See merge request !4689
\| * \| \| \| \| \| \| \| \| \| \|	Fix project header alignment media query bugmedia-query-bug	Annabel Dunstone	2016-06-15	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|