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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 '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
\| \| *	Improve readability of markdown files	Adam Stankiewicz	2016-07-11	2	-16/+18
\| \| \|
* \| \|	Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-state	Rémy Coutable	2016-07-18	35	-304/+507
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
\| * \| \|	Remove `lock_version` from the `merge_requests` table.undo-revert-of-4892	Timothy Andrew	2016-07-18	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- This was introduced (at some point) while rebasing `master` against the "developers can merge" feature branch. - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5310#note_13139705
\| * \| \|	Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""	Rémy Coutable	2016-07-18	35	-304/+508
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 530f5158e297f3cde27f3566cfe13bad74ba3b50. See !4892. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'master' into 'master'	Jacob Schatz	2016-07-18	2	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix activity heatmap to show proper day name. ## What does this MR do? This MR fixes issue #19909. ## Are there points in the code the reviewer needs to double check? Not necessarily, it's pretty straightforward, buuuut There was some discussion about whether GL wanted the activity heatmap to start on Monday or Sunday, this fix makes it start on Sunday, if GL is wanting it to start on Monday then some more substantial changes need to be made on the `calendar.js.coffee` script. ## Why was this MR needed? The amount of day names that were off from their dates was too damn high! :P ## What are the relevant issue numbers? Directly #19909 Also some related discussion (feature discussion): #19282, #5988 ## Screenshots (if relevant) Currently on GL.com ![Screen_Shot_2016-07-16_at_10.56.02_PM](/uploads/b45cfc56c29a8865a2bdc1f798409706/Screen_Shot_2016-07-16_at_10.56.02_PM.png) After MR ![Screen_Shot_2016-07-16_at_10.56.30_PM](/uploads/d8655bb259ced443a2c572ff03dcb8bb/Screen_Shot_2016-07-16_at_10.56.30_PM.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] 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 !5303
\| * \| \|	Update CHANGELOG fix indenting.	eanplatter	2016-07-18	1	-1/+1
\| \| \| \|
\| * \| \|	Fix activity heatmap to show proper day name.	eanplatter	2016-07-16	2	-1/+2
\| \| \| \|
* \| \| \|	Merge branch '19928-nomethoderror-undefined-method-id-for-nil-nilclass' into ↵	Rémy Coutable	2016-07-18	2	-1/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Don't blow up in tree view on empty repo ## What does this MR do? Stop the empty repo page blowing up with a 500 error when a user's default view is tree view. ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4997 made sure that the `tree` filter was only called if the user's default project view is tree, but left out the empty repo check. When users visit an empty repo with the tree view as default, they now get a 500. ## What are the relevant issue numbers? Closes #19928. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ (bug introduced in same release) - ~~[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 - [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 !5317
\| * \| \| \|	Don't blow up in tree view on empty repo	Sean McGivern	2016-07-18	2	-1/+21
\| \| \| \| \|
* \| \| \| \|	Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into ↵	Yorick Peterse	2016-07-18	3	-0/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Don't parse Rinku returned value to DocFragment when didn't change original html string. See merge request !5311
\| * \| \| \| \|	Don't parse Rinku returned value to DocFragment when it didn't change the ↵18593-avoid-parse_html-when-rinku-didnt-do-anything	Paco Guzman	2016-07-18	3	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	original html string.
* \| \| \| \| \|	Merge branch 'fix-track-user-migration' into 'master'	Rémy Coutable	2016-07-18	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable transaction when adding index for Ci::Pipeline ## What does this MR do? Adds missing `disable_ddl_transaction!` ## Why was this MR needed? Fixes a broken migration for PostgreSQL See merge request !5319
\| * \| \| \| \| \|	Disable transaction when adding index for Ci::Pipeline	Kamil Trzcinski	2016-07-18	1	-0/+2
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'store-variables-and-when-in-builds-table' into 'master'	Rémy Coutable	2016-07-18	9	-125/+151
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Store when and yaml variables in builds table ## What does this MR do? Stores `when` and `yaml_variables` in `ci_builds` table. ## Why was this MR needed? This is done in order to simplify the code responsible for creating a pipeline builds. ## What are the relevant issue numbers? This made as a pre-step for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5295. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] 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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5296
\| * \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵store-variables-and-when-in-builds-table	Kamil Trzcinski	2016-07-18	111	-1673/+1979
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	store-variables-and-when-in-builds-table # Conflicts: # db/schema.rb
\| * \| \| \| \| \|	Refactor gitlab_ci_yaml_processor variables tests	Kamil Trzcinski	2016-07-17	1	-52/+76
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove irrelevant comments	Kamil Trzcinski	2016-07-16	1	-14/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix gitlab_ci_yaml_processor_spec.rb	Kamil Trzcinski	2016-07-16	1	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix AddWhenAndYamlVariablesToCiBuilds migration	Kamil Trzcinski	2016-07-16	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix gitlab_ci_yaml_processor_spec.rb	Kamil Trzcinski	2016-07-16	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Store when and yaml variables in builds table	Kamil Trzcinski	2016-07-16	9	-73/+89
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docker-registry-work-with-redirect' into 'master'	Rémy Coutable	2016-07-18	5	-35/+138
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make docker registry work with location redirects when external storage is used ## What does this MR do? Honor `Location:` header when working with local registry. Location makes it possible to download manifests from external storage. ## What are the relevant issue numbers? Fixed https://gitlab.com/gitlab-org/gitlab-ce/issues/18477 ## Remark Adding `FollowRedirects` makes that we leak `Authorization:` in followed requests. That is why it is implemented manually and we are explicitly removing `Authorization` header. cc @marin @twk3 See merge request !4677
\| * \| \| \| \| \| \|	Update CHANGELOGdocker-registry-work-with-redirect	Kamil Trzciński	2016-07-15	1	-1/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make rubocop happy	Kamil Trzcinski	2016-07-15	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add CHANGELOG	Kamil Trzcinski	2016-07-15	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Explicitly remove authorization token and make sure that invalid addresses ↵	Kamil Trzcinski	2016-07-15	3	-51/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are properly handled
\| * \| \| \| \| \| \|	Allow blob to be redirected	Kamil Trzcinski	2016-07-15	1	-3/+34
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make docker registry work with location redirects when external storage is used	Kamil Trzcinski	2016-07-15	2	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'pending-tab' into 'master'	Rémy Coutable	2016-07-18	7	-21/+90
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Pending Tab to Builds ## What does this MR do? Add Pending Tab to Builds and separate "running" and "pending" jobs in UI. ## Why was this MR needed? Increase visibility to "pending" . ## What are the relevant issue numbers? Closes #19408 ## Screenshots Before: ![Zrzut_ekranu_2016-07-05_o_11.52.48](/uploads/01dc1f3664f5aacb2ec09d52d19c521e/Zrzut_ekranu_2016-07-05_o_11.52.48.png) After: ![Zrzut_ekranu_2016-07-05_o_11.51.34](/uploads/f3be02427996fecf50c65dd51ce1b9fb/Zrzut_ekranu_2016-07-05_o_11.51.34.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] 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) cc @ubudzisz @yorickpeterse @grzesiek @tmaczukin @zj [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash) See merge request !5084
\| * \| \| \| \| \| \| \|	Modify test for Build tabs	Katarzyna Kobierska	2016-07-18	1	-18/+26
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add tests to project builds for pending tab	Katarzyna Kobierska	2016-07-18	2	-5/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG Fix build spec for pending tab
\| * \| \| \| \| \| \| \|	Remove unused .js-running-count class	Katarzyna Kobierska	2016-07-18	2	-6/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add test for new pending tab and update tests for running tab	Katarzyna Kobierska	2016-07-18	1	-1/+35
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add Pending Tab to Admin Builds	Katarzyna Kobierska	2016-07-18	5	-4/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Pending Tab to Project Builds Update CHANGELOG
* \| \| \| \| \| \| \| \|	Merge branch 'fix/import-no-repo' into 'master'	Rémy Coutable	2016-07-18	5	-10/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow empty repos on import/export Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19849 See merge request !5312
\| * \| \| \| \| \| \| \|	added changelog	James Lopez	2016-07-18	1	-0/+1
\| \| \| \| \| \| \| \| \|