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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into issue_3945issue_3945	Rubén Dávila	2016-01-20	10	-0/+241
\|\
\| *	Merge branch 'feature/check-against-rbl-only' into 'master'	Robert Speicher	2016-01-20	10	-1/+242
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split from !2455 References #9092 See merge request !2515
\| \| *	Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-only	Tomasz Maczukin	2016-01-20	10	-1/+242
\| \| \|
* \| \|	Use a MR with commits.	Rubén Dávila	2016-01-20	1	-1/+1
\| \| \|
* \| \|	Merge branch 'master' into issue_3945	Douwe Maan	2016-01-20	31	-32/+159
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'fix-error-500-with-invalid-utf8' into 'master'	Robert Speicher	2016-01-20	2	-0/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gracefully handle invalid UTF-8 sequences in Markdown links Closes #6077 See merge request !2382
\| \| * \|	Gracefully handle invalid UTF-8 sequences in Markdown linksfix-error-500-with-invalid-utf8	Stan Hu	2016-01-20	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #6077
\| * \| \|	Merge branch 'sentry-integration' into 'master'	Robert Speicher	2016-01-20	10	-1/+76
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sentry integration Sentry is an event logging platform primarily focused on capturing and aggregating exceptions. With this MR it will be possible to log and track exceptions from GitLab to Sentry. https://gitlab.com/gitlab-com/operations/issues/39 See merge request !2485
\| \| * \| \|	Target '_blank'sentry-integration	Douwe Maan	2016-01-20	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Send user context to Sentry	Douwe Maan	2016-01-20	1	-0/+11
\| \| \| \| \|
\| \| * \| \|	Use sentry in env production only	Jeroen Nijhof	2016-01-20	3	-13/+17
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Jeroen Nijhof	2016-01-20	60	-146/+585
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sentry-integration Conflicts: db/schema.rb
\| \| * \| \| \|	Add sentry integration	Jeroen Nijhof	2016-01-18	9	-1/+61
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'adjust-unicorn-memory-limits' into 'master'	Robert Speicher	2016-01-20	2	-1/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use ENV variables for Unicorn worker killer & increase default limits Merge request that lead to this particular merge request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2421 [ci skip] See merge request !2513
\| \| * \| \| \| \|	Increase Unicorn memory limits to 300-350adjust-unicorn-memory-limits	Yorick Peterse	2016-01-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using this limit on GitLab.com it appears we're able to reduce response timings by about 620 milliseconds compared to the previous limit. See gitlab-org/gitlab-ce!2421 for more information.
\| \| * \| \| \| \|	Use env variables for Unicorn memory limits	Yorick Peterse	2016-01-20	2	-1/+6
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier for users to use their own limits based on their server configuration.
\| * \| \| \| \|	Merge branch 'update-gitlab_git' into 'master'	Douwe Maan	2016-01-20	3	-3/+4
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgraded gitlab_git to fix issue #5858 This updates the dependency on gitlab_git and fixes #5858 - reproduced locally and issue disappears with the change. Related MR that actually adds branch name support to commits_between: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/61 See merge request !2516
\| \| * \| \| \| \|	updated gitlab_git to fix issue #5858 and updated changelog	James Lopez	2016-01-20	3	-3/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master'	Dmitriy Zaporozhets	2016-01-20	1	-10/+7
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes tooltip doesn't duplicate the "me" name. Checks that "me" is not in the array of names in tooltip ![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978 See merge request !2454
\| \| * \| \| \| \| \|	Fixes issue where other emoji (not thumbup/thumbdown) were not removedawardemoji-tooltip-shows-people-multiple-times	Jacob Schatz	2016-01-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix the situation where the user has named themselves "me"	Jacob Schatz	2016-01-18	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stopped looking for existing user since remove functionality is fixed.
\| \| * \| \| \| \| \|	Fix underlying issue with emoji reactions	Jacob Schatz	2016-01-18	1	-6/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue was: blank space was rendering as a element in an array of authors. Element was being used by `join`. Original fix !2450 was trying to remove the space after it happened. This checks properly for it and only moves forward if it does not exist. Also removes "me" upon unchecking emoji.
\| \| * \| \| \| \| \|	Removing initial `,`.	Jacob Schatz	2016-01-18	1	-1/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fixes tooltip doesn't duplicate the "me" name.	Jacob Schatz	2016-01-18	1	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checks that "me" is not in the array of names in tooltip
\| * \| \| \| \| \| \|	Merge branch 'secret-shortcut-feature' into 'master'	Dmitriy Zaporozhets	2016-01-20	6	-7/+6
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds "t" as a shortcut for find file anywhere See merge request !2507
\| \| * \| \| \| \| \| \|	Simplifies the HAML if statement for project branch URL	Jacob Schatz	2016-01-20	1	-6/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix HTML so code passessecret-shortcut-feature	Jacob Schatz	2016-01-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code was failing because branch was named `'test'` with quotes which was escaping the javascript I was using.
\| \| * \| \| \| \| \| \|	Fixes test to not search whole page for content.	Jacob Schatz	2016-01-20	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix project find url so branch ref is not nil	Jacob Schatz	2016-01-19	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds autocomplete="off" to find input.
\| \| * \| \| \| \| \| \|	Proper spacing in HAML file `if` statement.	Jacob Schatz	2016-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Removes `defined?` in favor to just `if`	Jacob Schatz	2016-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add reference to the correct branch.	Jacob Schatz	2016-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sometimes `@ref` will be `nil`. this makes sure that the correct branch is passed in.
\| \| * \| \| \| \| \| \|	Adds `t` as a shortcut for find file anywhere	Jacob Schatz	2016-01-19	4	-5/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-01-20	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed invalid JSON in first JSON Example Just a comma missing See merge request !2487
\| \| * \| \| \| \| \| \|	Fixed invalid JSON in first JSON Example line 27	Ruben Schmidt	2016-01-18	1	-1/+1
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'issue_3749' into 'master'	Douwe Maan	2016-01-20	7	-5/+56
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Issues/MRs updated_at field when notes are generated Closes #3749 and #9130 See merge request !2493
\| \| * \| \| \| \| \|	Fix broken specs.issue_3749	Rubén Dávila	2016-01-19	1	-4/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Update Issue/MR everytime a Note is saved/destroyed.	Rubén Dávila	2016-01-19	2	-5/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Check if object respond to #touch before update.	Rubén Dávila	2016-01-18	1	-1/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Update Issues/MRs updated_at when user leaves comments.	Rubén Dávila	2016-01-18	6	-1/+50
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'ci/artifacts-remove-compressed-size' into 'master'	Douwe Maan	2016-01-20	3	-4/+0
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `Compressed to` column from build artifacts browser See #10982. See merge request !2509
\| \| * \| \| \| \| \|	Remove `Compressed to` column from build artifacts browserci/artifacts-remove-compressed-size	Grzegorz Bizon	2016-01-20	3	-4/+0
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #10982.
* \| \| \| \| \| \|	Validate bounds just to be sure	Douwe Maan	2016-01-20	1	-0/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Properly highlight lines around '\ No newline at end of file'	Douwe Maan	2016-01-20	5	-7/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Save and use actual diff base commit for MR diff highlighting	Douwe Maan	2016-01-20	10	-32/+75
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update tests	Douwe Maan	2016-01-20	3	-3/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix MR diff_refs	Douwe Maan	2016-01-20	3	-4/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Properly handle HTML entities with inline diffs	Douwe Maan	2016-01-20	5	-20/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Restore helper	Douwe Maan	2016-01-20	1	-0/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into issue_3945	Douwe Maan	2016-01-20	132	-275/+1031
\|\ \ \ \ \ \ \ \| \|/ / / / / /