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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Grapify the users APIgrapify-users-api	Robert Schilling	2016-11-21	1	-258/+250
\|
*	Merge branch 'grapify-to-h' into 'master'	Rémy Coutable	2016-11-14	3	-7/+9
\|\ \| \| \| \| \| \| \| \|	Use to_h to convert params to a hash See merge request !7406
\| *	Use #to_h to convert params to a hashgrapify-to-h	Robert Schilling	2016-11-14	3	-7/+9
\| \|
* \|	Merge branch 'fix/improve-naming-convention-in-ci-config' into 'master'	Kamil Trzciński	2016-11-14	30	-106/+104
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve naming convention in ci configuration module ## What does this MR do? This MR improves the naming convention in CI configuration module to reflect the domain design better. ## What are the relevant issue numbers? Related to #15060 See merge request !7448
\| * \|	Fix indentation in CI variables entry class	Grzegorz Bizon	2016-11-14	1	-1/+1
\| \| \|
\| * \|	Change name of method for setting CI config entries	Grzegorz Bizon	2016-11-14	4	-26/+26
\| \| \|
\| * \|	Improve naming convention in ci configuration modulefix/improve-naming-convention-in-ci-config	Grzegorz Bizon	2016-11-14	30	-105/+103
\| \| \|
* \| \|	Merge branch 'grapify-subscription-api' into 'master'	Rémy Coutable	2016-11-14	1	-23/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify subscription API ## What are the relevant issue numbers? Related to #22928 See merge request !7380
\| * \| \|	Grapify subscription API	Robert Schilling	2016-11-14	1	-23/+14
\| \| \| \|
* \| \| \|	Merge branch 'sh-fix-sidekiq-throttling-init' into 'master'	Robert Speicher	2016-11-14	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only turn on Sidekiq throttling if column exists If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452 See merge request !7446
\| * \| \| \|	Only turn on Sidekiq throttling if application settings existssh-fix-sidekiq-throttling-init	Stan Hu	2016-11-12	1	-1/+1
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452
* \| \| \|	Merge branch 'user_filter_auth' into 'master'	Rémy Coutable	2016-11-14	3	-14/+61
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296 See merge request !6606
\| * \| \| \|	Centralize LDAP config/filter logic	Drew Blessing	2016-11-11	3	-14/+61
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Centralize all LDAP config logic in `GitLab::LDAP::Config`. Previously, some logic was in the Devise initializer and it was not honoring the `user_filter`. If a user outside the configured `user_filter` signed in, an account would be created but they would then be denied access. Now that logic is centralized, the filter is honored and users outside the filter are never created.
* \| \| \|	Merge branch 'repository-name-emojis' into 'master'	Rémy Coutable	2016-11-14	1	-3/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added ability to put emojis into repository name ## Are there points in the code the reviewer needs to double check? Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt See merge request !7420
\| * \| \|	Added ability to put emojis into repository name	Vincent Composieux	2016-11-12	1	-3/+3
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Added ability to put emojis into repository name
* \| \|	Merge branch 'sidekiq-job-throttling' into 'master'	Douwe Maan	2016-11-11	2	-0/+28
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow certain Sidekiq jobs to be throttled ## What does this MR do? Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings. ![Screen_Shot_2016-11-04_at_4.51.24_PM](/uploads/a1f1d24c693fcdb278602765cd404d94/Screen_Shot_2016-11-04_at_4.51.24_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Related to #23352 See merge request !7292
\| * \| \|	Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttling	Patricio Cano	2016-11-11	1	-6/+8
\| \| \| \|
\| * \| \|	Refactored initializer code to its own class and added tests	Patricio Cano	2016-11-10	1	-0/+21
\| \| \| \|
\| * \| \|	Allow the Sidekiq queues to throttle and the factor by which to throttle ↵	Patricio Cano	2016-11-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	them to be configurable
\| * \| \|	Allow certain Sidekiq jobs to be throttled	Patricio Cano	2016-11-10	1	-0/+1
\| \|/ /
* \| \|	Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master'	Sean McGivern	2016-11-11	2	-2/+2
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the collapsed diff when converting a symlink to a regular file #21610 !6828 See merge request !6953
\| * \|	Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversion	Adam Niedzielski	2016-11-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In this case comparing old_path and new_path is not enough because there are two entires that match.
* \| \|	Merge branch 'grapify-token-api' into 'master'	Rémy Coutable	2016-11-10	1	-46/+30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
\| * \| \|	Grapify token API	Robert Schilling	2016-11-10	1	-46/+30
\| \| \| \|
* \| \| \|	Merge branch '23945-improve-ee_compat_check-task-part-3' into 'master'	Robert Speicher	2016-11-10	2	-82/+96
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improve ee_compat_check task (part 3)" Improve the `ee_compat_check` task with caching and keep artifacts on failure. Closes #23945. See merge request !7177
\| * \| \| \|	Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3	Rémy Coutable	2016-11-10	2	-82/+96
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'grapify-milestone-api' into 'master'	Rémy Coutable	2016-11-10	1	-54/+57
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify milestones API ## What are the relevant issue numbers? Related to #22928 See merge request !7373
\| * \| \| \|	Grapify milestones APIgrapify-milestone-api	Robert Schilling	2016-11-10	1	-54/+57
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'grapify-runners-api' into 'master'	Rémy Coutable	2016-11-10	1	-53/+64
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify runners API ## What are the relevant issue numbers? Related to #22928 See merge request !7377
\| * \| \|	Grapify runners API	Robert Schilling	2016-11-10	1	-53/+64
\| \|/ /
* \| \|	Merge branch 'grapify-session-api' into 'master'	Rémy Coutable	2016-11-10	1	-10/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grapify the session API ## What are the relevant issue numbers? Related to #22928 See merge request !7381
\| * \| \|	Grapify the session APIgrapify-session-api	Robert Schilling	2016-11-09	1	-10/+9
\| \|/ /
* \| \|	Merge branch 'feature/api_owned_resource' into 'master'	Sean McGivern	2016-11-10	1	-0/+10
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Add api endpoint `/groups/owned` See merge request !7103
\| * \|	Added API endpoint groups/owned	Borja Aparicio	2016-11-08	1	-0/+10
\| \| \|
* \| \|	Merge branch '23731-add-param-to-user-api' into 'master'	Sean McGivern	2016-11-09	1	-1/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add query param to filter users by 'external' & 'blocked' type on API Closes #23731 See merge request !7109
\| * \| \|	Add query param to filter users on 'external' & 'blocked' type on API	Yatish Mehta	2016-11-08	1	-1/+6
\| \| \| \|
* \| \| \|	Merge branch 'ldap_check_bind' into 'master'	Sean McGivern	2016-11-09	2	-13/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve ldap:check errors Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21621. See merge request !6601
\| * \| \| \|	Introduce better credential and error checking to `rake gitlab:ldap:check`	Drew Blessing	2016-11-08	2	-13/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was previously possible for invalid credential errors to go unnoticed in this task. Users would believe everything was configured correctly and then sign in would fail with 'invalid credentials'. This adds a specific bind check, plus catches errors connecting to the server. Also, specs :)
* \| \| \| \|	Merge branch '23403-fix-events-for-private-project-features' into 'security'	Robert Speicher	2016-11-09	1	-25/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect project visibility settings in the contributions calendar This MR fixes a number of bugs relating to access controls and date selection of events for the contributions calendar Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23403 See merge request !2019 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'fix-unathorized-cloning' into 'security'	Douwe Maan	2016-11-09	1	-31/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure external users are not able to clone disabled repositories. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23788 See merge request !2017 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'markdown-xss-fix-option-2.1' into 'security'	Douwe Maan	2016-11-09	1	-10/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix for HackerOne XSS vulnerability in markdown This is an updated blacklist patch to fix https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2007. No text is removed. Dangerous schemes/protocols and invalid URIs are left intact but not linked. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23153 See merge request !2015 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'issue_23548_dev' into 'master'	Douwe Maan	2016-11-09	9	-14/+78
\| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disable markdown in comments when referencing disabled features fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23548 This MR prevents the following references when tool is disabled: - issues - snippets - commits - when repo is disabled - commit range - when repo is disabled - milestones This MR does not prevent references to repository files, since they are just markdown links and don't leak information. See merge request !2011 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'faster_project_search' into 'master'	Sean McGivern	2016-11-08	1	-18/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Faster search inside Project See merge request !7353
\| * \| \| \|	Faster searchfaster_project_search	Valery Sizov	2016-11-08	1	-18/+12
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dz-refactor-contraints' into 'master'	Dmitriy Zaporozhets	2016-11-08	4	-32/+39
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor routing constraints ## What does this MR do? Refactors routing constraints ## Why was this MR needed? This refactoring make it possible to introduce nesting namespaces and project constrainer in future. ## What are the relevant issue numbers? Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121/ See merge request !7327
\| * \| \| \| \|	Add small improvements to constrainers and specs	Dmitriy Zaporozhets	2016-11-08	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Refactor routing constraints	Dmitriy Zaporozhets	2016-11-07	4	-32/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'dz-refactor-namespace-regex' into 'master'	Sean McGivern	2016-11-08	1	-0/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor namespace regex Reuse existing namespace regex constant in routing See merge request !7336
\| * \| \| \| \|	Refactor namespace regexdz-refactor-namespace-regex	Dmitriy Zaporozhets	2016-11-07	1	-0/+4
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'use-separate-token-for-incoming-email' into 'master'	Douwe Maan	2016-11-08	3	-7/+16
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use separate email-friendly token for incoming email See merge request !5914