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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Double to single quotes	Douwe Maan	2016-07-04	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add confirmation when canceling creating/editing with changes	Douwe Maan	2016-07-04	1	-0/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Cancel creating or editing note by hitting Escape	Douwe Maan	2016-07-04	1	-5/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'remove-lowercase-gitlab-ci-yml' into 'master'	Robert Speicher	2016-07-06	15	-238/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate templates that are lowercase See merge request !5114
\| * \| \| \| \|	Fix specs	Rémy Coutable	2016-07-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \|	Remove duplicate templates that are lowercase	Rémy Coutable	2016-07-06	14	-235/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '15094-throttling-pushes_since_gc' into 'master'	Douwe Maan	2016-07-06	2	-2/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Throttle the update of `project.pushes_since_gc` to 1 minute ## What does this MR do? Throttle the update of `project.pushes_since_gc` to alleviate DB load ## What are the relevant issue numbers? Relates to #15094 ## 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 - ~~[ ] 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 !5083
\| * \| \| \| \| \|	Throttle the update of `project.pushes_since_gc` to 1 minute15094-throttling-pushes_since_gc	Paco Guzman	2016-07-05	2	-2/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into ↵	Douwe Maan	2016-07-06	3	-3/+34
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix diff comments not showing up in activity feed ## What does this MR do? It fixes the detection of note events to check for `Note` and `LegacyDiffNote`. ## Are there points in the code the reviewer needs to double check? No? /cc @DouweM (since I believe you introduced `LegacyDiffNote` ## Why was this MR needed? To fix #19092. ## What are the relevant issue numbers? Fixes #19092. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 !5069
\| * \| \| \| \| \| \|	Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-note	Rémy Coutable	2016-07-06	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Fix diff comments not showing up in activity feed	Rémy Coutable	2016-07-04	3	-3/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'shell-version-bump' into 'master'	Douwe Maan	2016-07-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump GITLAB_SHELL_VERSION to 3.2.0 Bump GITLAB_SHELL_VERSION to 3.2.0 Needed for !4696 to properly work. Blocked by gitlab-org/gitlab-shell!62 See merge request !5101
\| * \| \| \| \| \| \| \|	Bump GITLAB_SHELL_VERSION to 3.2.0shell-version-bump	Patricio Cano	2016-07-05	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gh-labels' into 'master'	Robert Speicher	2016-07-06	11	-54/+123
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow `?`, or `&` for label names Closes #18727 See merge request !4724
\| * \| \| \| \| \| \| \|	Fix unescaped strings in the labels dropdown templategh-labels	Douglas Barbosa Alexandre	2016-07-06	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CHANGELOG	Douglas Barbosa Alexandre	2016-07-05	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Render label name contains ?, & in the labels dropdown without escaping	Douglas Barbosa Alexandre	2016-07-05	2	-6/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use CGI.unescapeHTML rather than doing the gsub with a map	Douglas Barbosa Alexandre	2016-07-05	2	-12/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move `unescape_html_entities` from LabelsHelper to Label model	Douglas Barbosa Alexandre	2016-07-05	4	-19/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Render references for labels that name contains ?, or &	Douglas Barbosa Alexandre	2016-07-05	6	-17/+77
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Allow '?', or '&' for label titles	Douglas Barbosa Alexandre	2016-07-05	6	-44/+69
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix/import-url-validator' into 'master'	Robert Speicher	2016-07-06	6	-4/+156
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing URL validation for import_url on projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17536 This MR fixes problems related to bypassing `import_url` validation on projects. This makes sure the URL is properly validated so we don't enter crap and fail while running workers that handle this URL. It also adds a migration to fix current invalid `import_url`s See merge request !4753
\| * \| \| \| \| \| \|	refactor url validator to use sanitizer for checkfix/import-url-validator	James Lopez	2016-07-01	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	typo	James Lopez	2016-06-30	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	few more changes from suggestions	James Lopez	2016-06-30	4	-5/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-06-30	414	-768/+1863
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/import-url-validator # Conflicts: # spec/models/project_spec.rb
\| * \| \| \| \| \| \| \|	use class method	James Lopez	2016-06-30	1	-7/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	few changes based on feedback	James Lopez	2016-06-30	5	-17/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix merge conflicts	James Lopez	2016-06-28	279	-1673/+4090
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	added more info on how addressable URI differs from what we use in UrlValidator	James Lopez	2016-06-24	1	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	updated validator based on feedback	James Lopez	2016-06-23	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix chnagelog	James Lopez	2016-06-22	1	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-06-22	1	-2/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/import-url-validator
\| * \| \| \| \| \| \| \| \| \|	another fix and fixed spec	James Lopez	2016-06-22	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	James Lopez	2016-06-22	324	-1798/+3805
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/import-url-validator
\| * \| \| \| \| \| \| \| \| \| \|	fix comment	James Lopez	2016-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fixed a few MySQL issues and added changelog	James Lopez	2016-06-20	3	-14/+46
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	started working on a migration for projects that have current import_url issues	James Lopez	2016-06-20	2	-7/+59
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	fix addressable url validator	James Lopez	2016-06-20	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branches 'fix/import-url-validator' and 'master' of ↵	James Lopez	2016-06-20	268	-1071/+11528
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:gitlab-org/gitlab-ce into fix/import-url-validator
\| * \| \| \| \| \| \| \| \| \| \| \|	fixing URL validation for import_url on projects	James Lopez	2016-06-17	3	-3/+55
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-templates-for-8-10' into 'master'	Rémy Coutable	2016-07-06	25	-24/+526
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add and update .gitignore & .gitlab-ci.yml templates for 8.10 See merge request !5107
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Add and update .gitignore & .gitlab-ci.yml templates for 8.10update-templates-for-8-10	Rémy Coutable	2016-07-06	25	-24/+526
\| \| \|_\|_\|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/project-export-error' into 'master'	Rémy Coutable	2016-07-06	4	-3/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more debug info to import/export and memory killer This should help debug https://gitlab.com/gitlab-org/gitlab-ce/issues/19124 further See merge request !5108
\| * \| \| \| \| \| \| \| \| \| \| \|	fix typofix/project-export-error	James Lopez	2016-07-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	even more debug	James Lopez	2016-07-06	3	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	add more debug info to project export	James Lopez	2016-07-05	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'allow-disabling-of-git-access-protocol' into 'master'	Douwe Maan	2016-07-05	29	-37/+360
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add setting that allows admins to choose which Git access protocols are enabled. ## What does this MR do? It allows admins to disable one of the two protocols for Git access. They can choose to enable just SSH, HTTP or allow both. If one of them is disabled, the clone URL in the project will show only the allowed protocol, and no dropdown to change protocols will be presented. ## What are the relevant issue numbers? Full implementation on GitLab's side for #18601 GitLab Shell implementation: gitlab-org/gitlab-shell!62 GitLab Workhorse implementation: gitlab-org/gitlab-workhorse!51 ## Screenshots (if relevant) ![Screen_Shot_2016-06-16_at_12.26.19_PM](/uploads/bad845142e9704a7385b2eaca51fd4eb/Screen_Shot_2016-06-16_at_12.26.19_PM.png) ![Screen_Shot_2016-06-20_at_4.24.54_PM](/uploads/6e452dd269e06f0be23841ce93866ed6/Screen_Shot_2016-06-20_at_4.24.54_PM.png) /cc @jschatz1 this MR touches the UI. Please review. See merge request !4696
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use keyword arguments for boolean values and use `span` instead of `a` for ↵allow-disabling-of-git-access-protocol	Patricio Cano	2016-07-05	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clone "button"
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Revert back to not defining a default Git access protocol.	Patricio Cano	2016-07-05	6	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|