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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'rs-regression-issue-guidelines' into 'master'	Dmitriy Zaporozhets	2016-02-02	1	-0/+20
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add notes about the regression issues to CONTRIBUTING.md [ci skip] See merge request !2661
\| *	Add notes about the regression issues to CONTRIBUTING.mdrs-regression-issue-guidelines	Robert Speicher	2016-01-31	1	-0/+20
\| \| \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'expand-git-instrumentation' into 'master'	Yorick Peterse	2016-02-02	1	-2/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand Git instrumentation This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants. See merge request !2664
\| * \|	Instrument various Rugged constantsexpand-git-instrumentation	Yorick Peterse	2016-02-01	1	-0/+10
\| \| \|
\| * \|	Instrument all Gitlab::Git instance methods	Yorick Peterse	2016-02-01	1	-2/+4
\| \| \|
* \| \|	Merge branch 'rs-relax-autosize' into 'master'	Robert Speicher	2016-02-01	5	-3/+278
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow manual resize of js-autosize textareas First, the autosize library was being too controlling and removed the `resize` property from any elements to which it was attached, removing the drag handle. We've disabled this behavior in the vendored library and added a spec to prevent a regression during an upgrade. Second, we detect (as best we can) when the user manually resizes an autosize textarea, and then remove the autosize behavior from it and increase its max-height. This should allow for the best of both worlds. Closes #12832 See merge request !2653
\| * \| \|	Allow manual resize of js-autosize textareasrs-relax-autosize	Robert Speicher	2016-02-01	5	-3/+278
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First, the autosize library was being too controlling and removed the `resize` property from any elements to which it was attached, removing the drag handle. Second, we detect when the user manually resizes an autosize textarea, and then remove the autosize behavior from it and increase its max-height. This should allow for the best of both worlds. Closes #12832
* \| \|	Update CHANGELOG	Robert Speicher	2016-02-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \|	Merge branch 'merge-request-closes-issues-performance' into 'master'	Robert Speicher	2016-02-01	3	-19/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize fetching issues closed by a merge request Related issue: #12419 See merge request !2625
\| * \| \|	Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performance	Yorick Peterse	2016-02-01	3	-19/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of running ClosingIssueExtractor for every commit in a merge request we can gather all the commit messages (and the merge request description), concatenate all this together and then run ClosingIssueExtractor only once. The result of this is that MergeRequest#closes_issues is now between 3.5x and 4x faster than the old setup. Using a merge request with 10 commits (each referencing a number of issues to close) this reduced the call duration from around 200 milliseconds to around 50 milliseconds. As a result of these changes the Jira related tests for MergeRequest#closes_issues have been removed. These tests stubbed Commit#closes_issues meaning that the only code that was really tested was the call to Array#uniq to filter out duplicate issues. As this code is no longer used (nor present) the corresponding tests were removed. Related: gitlab-org/gitlab-ce#12419
* \| \| \|	Merge branch 'stanhu/gitlab-ce-add-svg-support' into 'master'	Dmitriy Zaporozhets	2016-02-01	8	-1/+75
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render sanitized SVG images Originally opened at !637 by @stanhu. Closes https://github.com/gitlabhq/gitlabhq/issues/9265 ![Screen_Shot_2016-02-01_at_17.04.01](/uploads/8e5de906698493e127dcdc475da9aaef/Screen_Shot_2016-02-01_at_17.04.01.png) See merge request !2667
\| * \| \| \|	Render sanitized SVG images	Stan Hu	2016-02-01	8	-1/+75
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9265
* \| \| \|	Merge branch 'take-guidelines-into-account-for-mrs' into 'master'	Dmitriy Zaporozhets	2016-02-01	1	-0/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to Thoughtbot review guidelines. See merge request !2658
\| * \| \|	Link to Thoughtbot review guidelines.take-guidelines-into-account-for-mrs	Sytse Sijbrandij	2016-01-30	1	-0/+2
\| \| \| \|
* \| \| \|	Merge branch 'rs-two-factor-casing' into 'master'	Robert Speicher	2016-02-01	4	-6/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make "Two-factor" casing consistent throughout the application See merge request !2662
\| * \| \| \|	Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casing	Robert Speicher	2016-01-31	4	-6/+6
\|/ / / /
* \| \| \|	Update CHANGELOG	Robert Speicher	2016-01-31	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'improve-gitlab-flow-doc' into 'master'	Achilleas Pipinellis	2016-01-31	1	-3/+4
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve GitLab flow documentation regarding the WIP merge requests See merge request !2647
\| * \| \|	Improve GitLab flow documentation regarding the WIP merge requestsimprove-gitlab-flow-doc	Rémy Coutable	2016-01-29	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch 'rename-inline-diff' into 'master'	Robert Speicher	2016-01-31	13	-78/+206
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Mark inline difference between old and new paths when a file is renamed See merge request !2652
\| * \| \|	Fewer html_safesrename-inline-diff	Douwe Maan	2016-01-30	1	-2/+2
\| \| \| \|
\| * \| \|	Fix specs and add a new one	Douwe Maan	2016-01-30	2	-28/+37
\| \| \| \|
\| * \| \|	Mark inline difference between old and new paths when a file is renamed	Douwe Maan	2016-01-29	12	-75/+194
\| \| \| \|
* \| \| \|	Merge branch 'rs-issue-12706' into 'master'	Douwe Maan	2016-01-30	6	-14/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase the minimum length for commit SHA matching to 7 This is the git default and will help to prevent false positive matches. Closes #12706 See merge request !2655
\| * \| \| \|	Increase the minimum length for commit SHA matching to 7rs-issue-12706	Robert Speicher	2016-01-29	6	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the git default and will help to prevent false positive matches. Closes #12706
* \| \| \| \|	Merge branch 'cache-broadcast-message-current' into 'master'	Dmitriy Zaporozhets	2016-01-30	1	-1/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache BroadcastMessage.current. Fixes #12770 See merge request !2633
\| * \| \| \| \|	Change ttl to 1 minutecache-broadcast-message-current	Josh Frye	2016-01-29	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Cache BroadcastMessage.current for 5 minutes. Fixes #12770	Josh Frye	2016-01-29	1	-1/+3
\| \|/ / / /
* \| \| \| \|	Merge remote-tracking branch 'origin/background-delete-process'	Dmitriy Zaporozhets	2016-01-30	11	-9/+44
\|\ \ \ \ \
\| * \| \| \| \|	Update CHANGELOGbackground-delete-process	Josh Frye	2016-01-29	3	-8/+6
\| \| \| \| \| \|
\| * \| \| \| \|	First pass at deleting projects in the background.	Josh Frye	2016-01-29	11	-12/+49
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'warn-admin-oauth' into 'master'	Douwe Maan	2016-01-30	2	-1/+11
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Warn admin of granting admin rights during OAuth Fixes #3951 Warning style the same as the warning a user sees on a archived project. ![Screenshot_from_2016-01-25_20-06-33](/uploads/42e6a218b963311fd20c0b7c87c8cf4f/Screenshot_from_2016-01-25_20-06-33.png) See merge request !2601
\| * \| \| \| \|	Improve text on warning message	Zeger-Jan van de Weg	2016-01-26	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Warn admin of granting admin rights during OAuth	Zeger-Jan van de Weg	2016-01-26	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3951 Warning style the same as the warning a user sees on a archived project.
* \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Achilleas Pipinellis	2016-01-29	1	-5/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed typo for PRIVATE-TOKEN header Was PRIVATE_TOKEN but should be PRIVATE-TOKEN. Underscore vs. kebab-case. See merge request !2624
\| * \| \| \| \| \|	Fixed typo for PRIVATE-TOKEN header	Markus Fisch	2016-01-27	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Was PRIVATE_TOKEN but should be PRIVATE-TOKEN. Underscore vs. kebab-case.
* \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Robert Speicher	2016-01-29	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add missing `RAILS_ENV=production` bit to bundle command [ci skip] See merge request !2626
\| * \| \| \| \| \| \|	add missing `RAILS_ENV=production` bit to bundle command	Maverik Gately	2016-01-27	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-viewing-wiki-page-lastest-version-via-version-id' into ↵	Douglas Barbosa Alexandre	2016-01-29	2	-1/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix "old version" warning when viewing wiki page's latest version via version_id in URL Fixes #12712 See merge request !2627
\| * \| \| \| \| \| \|	Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-id	Douglas Barbosa Alexandre	2016-01-29	2	-1/+33
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'increase_lfs_size_column' into 'master'	Drew Blessing	2016-01-29	3	-3/+11
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase LFS objects size column Fixes #12745 Increases the `size` column integer limit to an 8-byte integer. This allows for a max value of `9223372036854775807` which is 9,223,372,036 GB. That should do it :smiley: I tested this by first reproducing the error (push a file larger than 2.1 GB). The error was: ``` RangeError (3145728000 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4): lib/gitlab/lfs/response.rb:232:in `store_file' lib/gitlab/lfs/response.rb:170:in `render_lfs_upload_ok' lib/gitlab/lfs/response.rb:51:in `block in render_storage_upload_store_response' lib/gitlab/lfs/response.rb:204:in `render_response_to_push' lib/gitlab/lfs/response.rb:50:in `render_storage_upload_store_response' lib/gitlab/lfs/router.rb:76:in `put_response' lib/gitlab/lfs/router.rb:20:in `try_call' lib/gitlab/backend/grack_auth.rb:41:in `call' lib/gitlab/backend/grack_auth.rb:18:in `call_with_kerberos_support' lib/gitlab/backend/grack_auth.rb:8:in `call' ``` Then I ran this migration and pushed the file again. It uploaded successfully. See merge request !2644
\| * \| \| \| \| \| \|	Increase LFS objects size column	Drew Blessing	2016-01-29	3	-3/+11
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'focus-emoji-search-field' into 'master'	Jacob Schatz	2016-01-29	4	-1/+9
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto-focus emoji award search field ![emoji-search-focus](/uploads/7cd0448e00ced19d3cf1c4fdd141c74f/emoji-search-focus.gif) Closes #12621 cc. @jschatz1 See merge request !2650
\| * \| \| \| \| \|	Added tests to emoji search field focus	Phil Hughes	2016-01-29	2	-0/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Auto-focus emoji award search field	Phil Hughes	2016-01-29	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12621
* \| \| \| \| \| \|	Merge branch 'note-background-job' into 'master'	Dmitriy Zaporozhets	2016-01-29	6	-21/+72
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Background process note logic for #3948 Quick and dirty way to get most of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist. ``` without background processing Completed 200 OK in 627ms (Views: 0.5ms \| ActiveRecord: 32.3ms) Completed 200 OK in 478ms (Views: 0.8ms \| ActiveRecord: 28.3ms) Completed 200 OK in 1107ms (Views: 0.6ms \| ActiveRecord: 36.6ms) with background processing Completed 200 OK in 108ms (Views: 0.6ms \| ActiveRecord: 4.7ms) Completed 200 OK in 78ms (Views: 0.5ms \| ActiveRecord: 4.5ms) Completed 200 OK in 164ms (Views: 0.5ms \| ActiveRecord: 8.3ms) ``` As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount. @dzaporozhets @yorickpeterse I would love some input on this. See merge request !2631
\| * \| \| \| \| \|	Fix Rubocop errornote-background-job	Josh Frye	2016-01-28	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update tests	Josh Frye	2016-01-28	2	-3/+27
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	[WIP] Background process note logic for #3948	Josh Frye	2016-01-28	4	-18/+45
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-remove-ip-blocking' into 'master'	Dmitriy Zaporozhets	2016-01-29	10	-235/+8
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partially revert "Add IP check against DNSBLs at account sign-up" This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact. See merge request !2643