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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added diff comments feature testfix-side-by-side-comment-widget	Luke "Jared" Bennett	2016-07-19	1	-0/+94
\|
*	Updated CHANGELOG.	Fatih Acet	2016-07-19	1	-0/+1
\|
*	Off mouse listener from document for diff comment button.	Fatih Acet	2016-07-19	1	-1/+3
\|
*	Fix inline view for comment button selector.	Fatih Acet	2016-07-19	1	-1/+4
\|
*	Revert "Refactored .prev and .next methods"	Fatih Acet	2016-07-19	1	-7/+3
\| \| \| \|	This reverts commit ec37d9553274e3bca58e4de44b932cdc72a37325.
*	Merge branch 'mr-widget-alignment' into 'master'	Fatih Acet	2016-07-18	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the alignment in the MR widget ## What does this MR do? Fixes the alignment of the browse button in the MR widget ## Screenshots (if relevant) ![Screen_Shot_2016-07-17_at_17.47.54](/uploads/41dcb0fad38fdd4dbccfda5ffaeaec6e/Screen_Shot_2016-07-17_at_17.47.54.png) See merge request !5307
\| *	Fixed the alignment in the MR widgetmr-widget-alignment	Phil Hughes	2016-07-17	1	-1/+1
\| \|
* \|	Merge branch 'sidebar-dropdowns-blur-link' into 'master'	Fatih Acet	2016-07-18	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Blurs the clicked link in dropdown menus ## What does this MR do? This fixes an issue where the dropdown menu would stay visible even when clicked out of it See merge request !5322
\| * \|	Blurs the clicked link in dropdown menussidebar-dropdowns-blur-link	Phil Hughes	2016-07-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	This fixes an issue where the dropdown menu would stay visible even when clicked out of it
* \| \|	Merge branch 'bug/sidekiq-cron-better-error' into 'master'	Gabriel Mazetto	2016-07-18	2	-1/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve cron_jobs loading error messages ## What does this MR do? Improves the error message from "Sidekiq Cron Jobs" plugin, when trying to load a incorrect definition from gitlab config files. This is the output before the fix: ``` 2016-06-08T16:43:19.277Z 2890 TID-gso49ojro INFO: Booting Sidekiq 4.1.2 with redis options {:url=>"unix:/var/run/redis/redis.sock", :namespace=>"resque:gitlab"} undefined method `delete' for nil:NilClass /home/git/gitlab/config/initializers/sidekiq.rb:16:in `block (2 levels) in <top (required)>' /home/git/gitlab/config/initializers/sidekiq.rb:16:in `each' /home/git/gitlab/config/initializers/sidekiq.rb:16:in `block in <top (required)>' /home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/sidekiq-4.1.2/lib/sidekiq.rb:70:in `configure_server' ``` This is the output after the fix: ``` 2016-07-18T10:53:22.414Z 66332 TID-oxal1bmik INFO: Booting Sidekiq 4.1.4 with redis options {:url=>"redis://localhost:6378", :namespace=>"resque:gitlab"} Invalid cron_jobs config key: 'registry'. Check your gitlab config file. /home/git/gitlab/config/initializers/sidekiq.rb:21:in `block (2 levels) in <top (required)>' /home/git/gitlab/config/initializers/sidekiq.rb:17:in `each' /home/git/gitlab/config/initializers/sidekiq.rb:17:in `block in <top (required)>' /home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/ruby-2.1.8/gems/sidekiq-4.1.4/lib/sidekiq.rb:70:in `configure_server' ``` Fixes #18378 ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Original error doesn't give any hint on where the problem can be, so the user can't easily troubleshoot unless he knows implementation details. ## What are the relevant issue numbers? #18378 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5318
\| * \| \|	Improve cron_jobs loading error messages	Gabriel Mazetto	2016-07-18	2	-1/+9
\|/ / /
* \| \|	Merge branch 'caironoleto/gitlab-ce-cn-issue-19747'	Douwe Maan	2016-07-18	8	-8/+84
\|\ \ \
\| * \| \|	Allow bulk (un)subscription from issues in issue index	Cairo Noleto	2016-07-14	8	-8/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixies #19747
* \| \| \|	Merge branch 'issue_13343' into 'master'	Robert Speicher	2016-07-18	7	-2/+79
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow build email service to be tested Fixes #13343 See merge request !5223
\| * \| \| \|	Allow build email service to be testedissue_13343	Felipe Artur	2016-07-15	7	-2/+79
\| \| \| \| \|
* \| \| \| \|	Merge branch 'csp-basics' into 'master'	Robert Speicher	2016-07-18	3	-0/+116
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Content Security Policy Ref: #18231 This uses twitter's [secure_headers gem](https://github.com/twitter/secureheaders). See merge request !4770
\| * \| \| \| \|	Minor policy refinements.csp-basics	Connor Shea	2016-07-18	1	-8/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Document the CSP file.	Connor Shea	2016-07-18	1	-11/+38
\| \| \| \| \| \|
\| * \| \| \| \|	Only enable CSP policies when relevant features are enabled.	Connor Shea	2016-07-18	1	-1/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gravatar, Google Analytics, Piwik, Recaptcha, etc.
\| * \| \| \| \|	Remove background_jobs-specific headers.	Connor Shea	2016-07-18	2	-7/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Only report to Sentry when it's enabled.	Connor Shea	2016-07-18	1	-2/+6
\| \| \| \| \| \|
\| * \| \| \| \|	Add Sidekiq-specific headers.	Connor Shea	2016-07-18	2	-6/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Add the CSP reporting URI of Sentry.	Connor Shea	2016-07-18	1	-1/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Update image policy to allow external images over HTTPS.	Connor Shea	2016-07-18	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unsafe eval directive from scripts.	Connor Shea	2016-07-18	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fix that which hath been broken. Except the sidekiq admin iframe.	Connor Shea	2016-07-18	2	-0/+42
\| \| \| \| \| \|
\| * \| \| \| \|	Initial secure_headers config after some testing.	Connor Shea	2016-07-18	2	-0/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '19820-safer-diffs' into 'master'	Douwe Maan	2016-07-18	12	-23/+96
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Collapsed diffs lines/size don't accumulate to overflow diffs. ## What does this MR do? Reduce the number of lines that we highlight on big diffs to try to reduce the degradation introduced by !4990 as you can see on the issue description #19820 . We collapse any files after the diff is over the number of safe files (100), or over the safe lines (500) or over the safe number of bytes (5KB x 100 files). We still need to bump the gitlab_git and point this branch to the new gitlab_git version. ## What are the relevant issue numbers? Closes #19820 Closes #19885 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5306
\| * \| \| \| \| \|	Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffs	Paco Guzman	2016-07-18	12	-23/+96
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '19420-render-only-commit-title' into 'master' 19889-shortcuts-modal-is-broken	Douwe Maan	2016-07-18	4	-4/+24
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render only commit title ## What does this MR do? Render only commit title in builds ## Why was this MR needed? Better readability ## What are the relevant issue numbers? Closes #19420 ## Screenshots (if relevant) ![after](/uploads/fcdd59d74a0f91f6ac847f7f02d5f07f/after.png)![before](/uploads/71ca6dabf31452a1a8dfb15ecb8860c5/before.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @kradydal @yorickpeterse @grzesiek @tmaczukin @dzaporozhets [@tomash](https://github.com/tomash) [@chastell](https://github.com/chastell) this is connected to closed MR [!5109](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5109) See merge request !5131
\| * \| \| \| \| \|	add modification to commit title test	ubudzisz	2016-07-18	1	-9/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add modification to commit title test add empty line
\| * \| \| \| \| \|	modify view test to commit title	ubudzisz	2016-07-18	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	modify view test to commit title-repair rubocop modify view test to commit title-repair rubocop modify view test to commit title-repair rubocop remove empty line in CHANGELOG
\| * \| \| \| \| \|	Update CHANGELOG	ula budziszewska	2016-07-18	1	-2/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add test to view	ubudzisz	2016-07-18	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repair rubocop test and update CHANGELOG repair rubocop test repair rubocop repair rubocop repair rubocop
\| * \| \| \| \| \|	render only commit title	ubudzisz	2016-07-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update CHANGELOG
\| * \| \| \| \| \|	Update CHANGELOG - remove empty line	ula budziszewska	2016-07-18	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	modify view test to commit title	ubudzisz	2016-07-18	1	-10/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	modify view test to commit title-repair rubocop modify view test to commit title-repair rubocop modify view test to commit title-repair rubocop
\| * \| \| \| \| \|	Update CHANGELOG	ula budziszewska	2016-07-18	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add test to view	ubudzisz	2016-07-18	2	-9/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	repair rubocop test and update CHANGELOG repair rubocop test repair rubocop repair rubocop repair rubocop
\| * \| \| \| \| \|	repair rubocop test	ubudzisz	2016-07-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add git-commit-title-method into pipeline model and modify view	ubudzisz	2016-07-18	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add git-commit-title-method into tests
\| * \| \| \| \| \|	add try to title method	ubudzisz	2016-07-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	render-only-commit-title-update	ubudzisz	2016-07-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	render only commit title	ubudzisz	2016-07-18	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update CHANGELOG
\| * \| \| \| \| \|	add try to title method	ubudzisz	2016-07-18	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	render-only-commit-title-update	ubudzisz	2016-07-18	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	render only commit title	ubudzisz	2016-07-18	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update CHANGELOG
* \| \| \| \| \| \|	Merge branch 'dz-improve-markdown' into 'master'	Dmitriy Zaporozhets	2016-07-18	2	-16/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve markdown Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4975 (thanks @sheerun) with small changes on top cc @iamphill @tauriedavis See merge request !5314
\| * \| \| \| \| \| \|	Reduce font-size for headers for nicer and more compact lookdz-improve-markdown	Dmitriy Zaporozhets	2016-07-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Merge branch 'patch1' of https://gitlab.com/sheerun/gitlab-ce into ↵	Dmitriy Zaporozhets	2016-07-18	2	-16/+18
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dz-improve-markdown