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

	Commit message (Collapse)	Author	Age	Files	Lines
*	initial dropdown integration with gitlabnew-dropdowns	Jacob Schatz	2016-01-05	7	-10/+1278
\|
*	Merge branch 'show-all-builds-by-default' into 'master'	Robert Speicher	2016-01-04	7	-71/+106
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Show all builds by default in the builds page Fixes #4240 See merge request !2243
\| *	Update CHANGELOG	Robert Speicher	2016-01-04	1	-1/+0
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Show 'All' tab by default in the builds pageshow-all-builds-by-default	Douglas Barbosa Alexandre	2016-01-04	7	-71/+107
\| \|
* \|	Merge branch 'debug-banzai-cache' into 'master'	Robert Speicher	2016-01-04	1	-7/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue. See https://gitlab.com/gitlab-org/gitlab-ce/issues/4130#note_3012511 See merge request !2283
\| * \|	Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue.debug-banzai-cache	Douwe Maan	2016-01-04	1	-7/+14
\| \|/
* \|	Merge branch 'rs-issue-201' into 'master'	Dmitriy Zaporozhets	2016-01-04	2	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent duplicate "username has already been taken" validation message Closes #201 - two-year-old bug, woo! :boom: :tada: See merge request !2279
\| * \|	Prevent duplicate "username has already been taken" validation messagers-issue-201	Robert Speicher	2016-01-02	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #201 - two-year-old bug, woo! :boom: :tada:
* \| \|	Merge branch 'reverting-rs-remove-jquery-blockui' into 'master'	Dmitriy Zaporozhets	2016-01-04	2	-0/+591
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'" This reverts commit bc12750fcc7a8637771e1449493cdd3cee9ebd64, reversing changes made to 8a04b84e09c4318ac46808d0debc4997b52a2314. See merge request !2285
\| * \| \|	Revert "Merge branch 'rs-remove-jquery-blockui' into 'master' "reverting-rs-remove-jquery-blockui	Jacob Schatz	2016-01-04	2	-0/+591
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit bc12750fcc7a8637771e1449493cdd3cee9ebd64, reversing changes made to 8a04b84e09c4318ac46808d0debc4997b52a2314.
* \| \| \|	Merge branch 'extra-system-hooks' into 'master'	Stan Hu	2016-01-04	6	-16/+102
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added system hooks messages for renaming and transferring a project This is work in progress but I wanted to get some feedback on it in case there is something I've missed or a better way to do it. As the title says when a project is renamed or transferred to another group a system hook message is generated. Currently adds a couple of extra properties to the standard project system hooks messages. old_path_with_namespace - The old path of the project so we can see what has been renamed / transferred changed_at - The time that change took place My main concern is if there is a better way of doing this than passing the extra_data variable into the system hook. Would it be better to extend the project model with these 2 items as transient properties as I doubt they would need to be saved to the database? The other I've also seen, but can't find, someone talking about the emails sent when a project is renamed or transferred doesn't reference the original project path so if you have similarly named projects then you might not know what has been moved. I think the extra_data (or however it is best to implement this) would allow the extra information to be sent in emails. Closes [System hooks for project transfer and repository rename](http://feedback.gitlab.com/forums/176466-general/suggestions/6006233-system-hooks-for-project-transfer-and-repository-r) See merge request !611
\| * \| \| \|	Added system hooks messages for renaming and transferring a project	Steve Norman	2016-01-04	6	-16/+102
\| \|/ / /
* \| \| \|	Merge branch 'namespace-clean_up' into 'master'	Valery Sizov	2016-01-04	16	-261/+16
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove public field from namespace https://gitlab.com/gitlab-org/gitlab-ce/issues/3580 See merge request !2222
\| * \| \|	remove public field from namespace and refactoringnamespace-clean_up	Valery Sizov	2016-01-04	16	-261/+16
\|/ / /
* \| \|	Merge branch 'stabilize_emoji' into 'master'	Dmitriy Zaporozhets	2016-01-04	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Catch Emoji name lookup error This is a first part of the fix https://gitlab.com/gitlab-org/gitlab-ce/issues/5829 See merge request !2282
\| * \|	catch Emoji encode error	Valery Sizov	2016-01-04	1	-1/+1
\|/ /
* \|	Merge branch 'rs-delimit-all-the-things' into 'master'	Dmitriy Zaporozhets	2016-01-04	11	-36/+36
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	number_with_delimiter most of the things See merge request !2258
\| * \|	number_with_delimiter most of the thingsrs-delimit-all-the-things	Robert Speicher	2015-12-31	11	-36/+36
\| \| \|
* \| \|	Merge branch 'rs-abuse-report-form' into 'master'	Dmitriy Zaporozhets	2016-01-04	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add js-requires-input and js-quick-submit to abuse report form See merge request !2245
\| * \| \|	Add js-requires-input and js-quick-submit to abuse report formrs-abuse-report-form	Robert Speicher	2015-12-30	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'rs-remove-jquery-blockui' into 'master'	Dmitriy Zaporozhets	2016-01-04	2	-591/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove jquery.blockUI.js plugin It was required but no longer used. See merge request !2273
\| * \| \| \|	Remove jquery.blockUI.js plugin	Robert Speicher	2016-01-01	2	-591/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was required but never used.
* \| \| \| \|	Merge branch 'rs-remove-jquery-history-js' into 'master'	Dmitriy Zaporozhets	2016-01-04	4	-6/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove jquery.history.js plugin We're not concerning ourselves with non-HTML5 browser compatibility, and this removes 21 KB from our compiled JavaScript. Bonus fix: There was an extra space after the query string in the URLs that has now been removed. See merge request !2272
\| * \| \| \| \|	Remove jquery.history.js pluginrs-remove-jquery-history-js	Robert Speicher	2016-01-01	4	-6/+4
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We're not concerning ourselves with non-HTML5 browser compatibility, and this removes 21 KB from our compiled JavaScript. Bonus fix: There was an extra space after the query string in the URLs that has now been removed.
* \| \| \| \|	Merge branch 'autocomplete-performance' into 'master'	Dmitriy Zaporozhets	2016-01-04	6	-5/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improving autocomplete performance part 2 Related issue: gitlab-org/gitlab-ce#3507 See merge request !2253
\| * \| \| \| \|	Optimize CSS expressions produced by Nokogiriautocomplete-performance	Yorick Peterse	2015-12-31	4	-2/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nokogiri produces inefficient XPath expressions when given CSS expressions such as "a.gfm". Luckily these expressions can be optimized quite easily while still achieving the same results. In the two cases where this optimization is applied the run time has been reduced from around 170 ms to around 15 ms.
\| * \| \| \| \|	Don't use delegate to delegate trivial methods	Yorick Peterse	2015-12-31	1	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Around 300 ms (in total) would be spent in these delegated methods due to the extra stuff ActiveSupport adds to the compiled methods. Because these delegations are so simple we can just manually define the methods, saving around 275 milliseconds.
\| * \| \| \| \|	Use XPath for searching link nodes	Yorick Peterse	2015-12-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a tad faster than letting Nokogiri figure out whether it should evaluate the query as CSS or XPath and then actually evaluating it.
* \| \| \| \| \|	Merge branch 'rs-bump-bootstrap-sass' into 'master'	Dmitriy Zaporozhets	2016-01-04	2	-6/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump bootstrap-sass to ~> 3.3.0 Resolves bootlint error: `bootlint: W013 Bootstrap version might be outdated. Latest version is at least 3.3.6 ; saw what appears to be usage of Bootstrap 3.3.5` See merge request !2275
\| * \| \| \| \| \|	Bump bootstrap-sass to ~> 3.3.0rs-bump-bootstrap-sass	Robert Speicher	2016-01-01	2	-6/+6
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-bump-cal-heatmap' into 'master'	Dmitriy Zaporozhets	2016-01-04	6	-50/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump cal-heatmap-rails to ~> 3.5.0 See merge request !2276
\| * \| \| \| \| \|	Update cal-heatmap style overridesrs-bump-cal-heatmap	Robert Speicher	2016-01-01	1	-36/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some were no longer needed, others needed `!important`.
\| * \| \| \| \| \|	Simplify `ContributionsCalendar#starting_year` and `#starting_month`	Robert Speicher	2016-01-01	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Reorder JS requires	Robert Speicher	2016-01-01	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The old way broke d3, for some reason.
\| * \| \| \| \| \|	Remove unused "options" object from Calendar JS	Robert Speicher	2016-01-01	1	-5/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump d3_rails to ~> 3.5.0	Robert Speicher	2016-01-01	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump cal-heatmap-rails to ~> 3.5.0	Robert Speicher	2016-01-01	2	-3/+3
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'expire-cache-on-app-settings-change' into 'master'	Dmitriy Zaporozhets	2016-01-04	4	-3/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expire view caches when application settings change If the admin disables Gravatar, for example, before the views would not invalidate. Now they invalidate automatically when this happens. Closes #5728 See merge request !2280
\| * \| \| \| \| \|	Expire view caches when application settings change	Stan Hu	2016-01-03	4	-3/+4
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #5728
* \| \| \| \| \|	Merge branch 'docs/local-share-upload' into 'master'	Achilleas Pipinellis	2016-01-04	1	-0/+43
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs: raketasks: Add documentation on uploading to mounted shares Fog has a local storage provider, which can be use to copy backups to locally mounted cifs / nfs / smb shares. This MR adds documentation to doc/raketasks/backup_restore.md in response to #3387. @stanhu I found some time tonight and was able to get this started earlier than I initially expected, glad I could contribute. See merge request !2246
\| * \| \| \| \| \|	docs: raketasks: Add documentation on uploading to mounted shares	Nathan Lowe	2015-12-29	1	-0/+43
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9943 from Atul9/master	Stan Hu	2016-01-03	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update copyright notice to 2016 [ci skip]
\| * \| \| \| \| \| \|	Update copyright notice to 2016 [ci skip]	Atul Bhosale	2016-01-03	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-safari-version-check' into 'master'	Dmitriy Zaporozhets	2016-01-03	2	-5/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't attempt to set Referrer policy in Safari While Safari supports the policy, it does not (currently, as of 9.x) recognize `origin-when-cross-origin` as a valid value, so we omit the policy entirely under Safari. Closes #5609 See merge request !2269
\| * \| \| \| \| \|	Don't attempt to set Referrer policy in Safarirs-safari-version-check	Robert Speicher	2015-12-31	2	-5/+5
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While Safari supports the policy, it does not (currently, as of 9.x) recognize `origin-when-cross-origin` as a valid value, so we omit the policy entirely under Safari. Closes #5609
* \| \| \| \| \|	Merge branch 'fix_ci_settings_typo' into 'master'	Robert Speicher	2016-01-01	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in CI settings Remove a little typo in the CI section of the settings. See merge request !2270
\| * \| \| \| \| \|	Fix typo in CI settings	Steffen Köhler	2016-01-01	1	-1/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'fix_broken_docs_link' into 'master'	Achilleas Pipinellis	2016-01-01	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken SVN migration link Closes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/45 See merge request !2271
\| * \| \| \| \|	Fix broken SVN migration link [ci skip]	Achilleas Pipinellis	2016-01-01	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-12-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]