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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Backport of 5942-extract-ee-specific-filesccr/backport_of_extract_ee_files	Chantal Rollison	2018-05-31	1	-13/+17
\|
*	Merge branch '46799-fix-tabs-bs4' into 'master'	Clement Ho	2018-05-31	5	-26/+36
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix active tab styling Closes #46799 See merge request gitlab-org/gitlab-ce!19264
\| *	Fix active tab styling	Annabel Gray	2018-05-31	5	-26/+36
\|/
*	Merge branch 'winh-capybara-html-hack-docs' into 'master'	Clement Ho	2018-05-31	1	-0/+4
\|\ \| \| \| \| \| \| \| \|	Add link to hack for styling Capybara HTML dumps See merge request gitlab-org/gitlab-ce!19205
\| *	Add link to hack for styling Capybara HTML dumps	Winnie Hellmann	2018-05-31	1	-0/+4
\|/
*	Merge branch '44184-issues_ical_feed' into 'master'	Douwe Maan	2018-05-31	69	-186/+569
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Export assigned issues in iCalendar feed Closes #44184 See merge request gitlab-org/gitlab-ce!17783
\| *	Export assigned issues in iCalendar feed	Imre Farkas	2018-05-31	69	-186/+569
\|/
*	Merge branch 'sh-fix-issue-api-perf-n-plus-one' into 'master'	Nick Thomas	2018-05-31	2	-1/+6
\|\ \| \| \| \| \| \| \| \|	Eliminate cached N+1 queries for projects in Issue API See merge request gitlab-org/gitlab-ce!19269
\| *	Eliminate cached N+1 queries for projects in Issue API	Stan Hu	2018-05-31	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In CE, every `Issue` entity is also a `ProjectEntity`, which calls `entity&.project.try(:id)` to show the project ID. In an API request with 100 issues, this would hit the Rails statement cache 100 times for the same project and cause unnecessary overhead as related models would also be loaded. In EE, we call `Issue#supports_weight?` for each issue, which then calls `project&.feature_available?(:issue_weights)`. If the project is not preloaded, this incurs additional overhead, as each individual Project object has to be queried. This can lead to a significant performance hit. In loading the CE project with 100 issues, this contributed to at least 22% of the load time. See https://gitlab.com/gitlab-org/gitlab-ce/issues/47031 for why testing this is a bit tricky.
* \|	Merge branch 'rails5-fix-46230' into 'master'	Rémy Coutable	2018-05-31	2	-6/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use strings as properties key in kubernetes service spec. See merge request gitlab-org/gitlab-ce!19265
\| * \|	Use strings as properties key in kubernetes service spec.	Jasper Maes	2018-05-30	2	-6/+11
\| \| \|
* \| \|	Merge branch 'gitignore-vendor-gitaly-ruby' into 'master'	Rémy Coutable	2018-05-31	1	-0/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add /vendor/gitaly-ruby to gitignore See merge request gitlab-org/gitlab-ce!19261
\| * \| \|	Add /vendor/gitaly-ruby to gitignore	Jacob Vosmaer	2018-05-30	1	-0/+1
\| \|/ /
* \| \|	Merge branch 'rails5-calendar' into 'master'	Yorick Peterse	2018-05-31	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace .having with .where in calendar query Closes #46964 See merge request gitlab-org/gitlab-ce!19230
\| * \| \|	Replace .having with .where in calendar query	Jan Provaznik	2018-05-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the current syntax doesn't work properly in Rails 5, the resulting query looks like: HAVING "events"."project_id" IN (0) instead of: HAVING "events"."project_id" IN (SELECT "projects"."id" FROM... Also we should not use ActiveRecord internal methods. In this case we can filter projects in WHERE clause instead of doing this in HAVING clause. Usage of WHERE should be also more efficient because grouping is then done on much smaller subset of records.
* \| \| \|	Merge branch 'rails5-exists-query' into 'master'	Yorick Peterse	2018-05-31	1	-5/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace `.exists` with `EXISTS ()` Closes #46277 See merge request gitlab-org/gitlab-ce!19178
\| * \| \| \|	Replace `.exists` with `EXISTS ()`	Jan Provaznik	2018-05-28	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`.exists` should not be used because it's an internal ActiveRecord method, but we can easily generate the same sql query with `EXISTS`.
* \| \| \| \|	Merge branch 'gitaly-0.104.0' into 'master'	Douwe Maan	2018-05-31	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Gitaly 0.104.0 See merge request gitlab-org/gitlab-ce!19258
\| * \| \| \| \|	Use Gitaly 0.104.0	Jacob Vosmaer	2018-05-30	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch '46445-fix-gitaly-tree-entry-encoding' into 'master'	Douwe Maan	2018-05-31	6	-5/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix encoding bug in Gitaly::Commit::TreeEntry Closes #46445 and gitaly#1208 See merge request gitlab-org/gitlab-ce!19243
\| * \| \| \| \|	Fix encoding error in Gitaly::Commit::TreeEntry	Kim "BKC" Carlbäcker	2018-05-30	6	-5/+13
\| \|/ / / /
* \| \| \| \|	Merge branch ↵	Phil Hughes	2018-05-31	6	-148/+84
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'45520-remove-links-from-web-ide-unexpectedly-navigate-you-to-a-different-page' into 'master' Resolve "Remove links from Web IDE unexpectedly navigate you to a different page" Closes #45520 See merge request gitlab-org/gitlab-ce!19129
\| * \| \| \| \|	Resolve "Remove links from Web IDE unexpectedly navigate you to a different ↵	Sam Beckham	2018-05-31	6	-148/+84
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page"
* \| \| \| \|	Merge branch 'leipert-port-project-settings' into 'master'	Rémy Coutable	2018-05-31	6	-42/+50
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup code for General Project Settings See merge request gitlab-org/gitlab-ce!19245
\| * \| \| \| \|	Cleanup code for General Project Settings	Lukas Eipert	2018-05-31	6	-42/+50
\|/ / / / /
* \| \| \| \|	Merge branch '46903-osw-fix-permitted-params-filtering-on-merge-scheduling' ↵	Sean McGivern	2018-05-31	3	-4/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Adjust permitted params filtering on merge scheduling Closes #46903 See merge request gitlab-org/gitlab-ce!19255
\| * \| \| \| \|	Adjust permitted params filtering on merge scheduling46903-osw-fix-permitted-params-filtering-on-merge-scheduling	Oswaldo Ferreira	2018-05-30	3	-4/+9
\| \|/ / / /
* \| \| \| \|	Merge branch ↵	Sean McGivern	2018-05-31	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'46991-unable-to-start-rails-console-if-using-master-from-gitlab-shell' into 'master' Resolve "Unable to start rails console if using master from gitlab-shell" Closes #46991 See merge request gitlab-org/gitlab-ce!19251
\| * \| \| \| \|	better handle a missing gitlab-shell version	Brett Walker	2018-05-30	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rails5-cattr' into 'master'	Douwe Maan	2018-05-31	1	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cattr_accessor definition Closes #46282 See merge request gitlab-org/gitlab-ce!19192
\| * \| \| \| \| \|	Fix cattr_accessor definition	Jan Provaznik	2018-05-28	1	-3/+1
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use cattr_accessor directly inside the defined class, otherwise in Rails 5 this accessor returns nil.
* \| \| \| \| \|	Merge branch 'fj-36819-remove-v3-api' into 'master'	Douwe Maan	2018-05-31	97	-16029/+356
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removal of API v3 from the codebase Closes #36819 See merge request gitlab-org/gitlab-ce!18970
\| * \| \| \| \| \|	Removed API endpoint and specsfj-36819-remove-v3-api	Francisco Javier López	2018-05-30	97	-16029/+356
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '46971-extra-whitespace' into 'master'	Phil Hughes	2018-05-31	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Extra whitespace when hovering commit sha in MR widget" Closes #46971 See merge request gitlab-org/gitlab-ce!19267
\| * \ \ \ \ \	Merge branch 'master' into 46971-extra-whitespace	Filipa Lacerda	2018-05-31	78	-993/+892
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (32 commits) Update CHANGELOG.md for 10.8.3 Update "col-xs" usage to bootstrap4 Add missing usage_ping_enabled to API settings Make Repository#blob_data_at a public method Fix UI broken in line profiling modal due to Bootstrap 4 Only preload member records for the relevant projects/groups/user in projects API Fix   after sign-in with Google button Fix a wrong link reference in docs Simplify spec: `2.times.each` -> `2.times` Replace grape-route-helpers with our own grape-path-helpers Add archived param to the json response Consider we might have prefix for stable branches Convert spec/javascripts/.eslintrc to yml format as well Remove version lock on awesome_print dependency Fix import project by url layout Fix missing timeout value in object storage pre-authorization call fix last lints disable no-multi-assign fix `spaced-comment` remove unused createComponentWithMixin from vue spec helpers ...
\| * \| \| \| \| \|	Remove whitespace	Filipa Lacerda	2018-05-30	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-relative-url-root-in-development' into 'master'	Rémy Coutable	2018-05-31	3	-2/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix various bugs related to relative_url_root in development See merge request gitlab-org/gitlab-ce!19213
\| * \| \| \| \| \| \|	Fix various bugs related to relative_url_root in development	Douwe Maan	2018-05-29	3	-2/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'improve-snippets-docs' into 'master'	Achilleas Pipinellis	2018-05-31	1	-13/+30
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve structure of snippets documentation See merge request gitlab-org/gitlab-ce!19234
\| * \| \| \| \| \| \| \|	Improve structure of snippets documentation	Andreas Kämmerle	2018-05-31	1	-13/+30
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'add-project-features-docs' into 'master'	Achilleas Pipinellis	2018-05-31	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Wiki and Snippets to project feature overview See merge request gitlab-org/gitlab-ce!19235
\| * \| \| \| \| \| \|	Add Wiki and Snippets to project feature overview	Andreas Kämmerle	2018-05-30	1	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.8.3	Mayra Cabrera	2018-05-30	6	-26/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch '47002-fix-empty-wiki-illustration' into 'master'	Clement Ho	2018-05-30	3	-6/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update "col-xs" usage to bootstrap4 Closes #47002 See merge request gitlab-org/gitlab-ce!19256
\| * \| \| \| \| \| \| \|	Update "col-xs" usage to bootstrap4	Paul Slaughter	2018-05-30	3	-6/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sh-move-blob-data-at-public' into 'master'	Robert Speicher	2018-05-30	1	-8/+8
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Repository#blob_data_at a public method See merge request gitlab-org/gitlab-ce!19259
\| * \| \| \| \| \| \| \|	Make Repository#blob_data_at a public method	Stan Hu	2018-05-30	1	-8/+8
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reduces conflicts with EE, where it is public because it is called in ee/lib/gitlab/ci/external/file/local.rb.
* \| \| \| \| \| \| \|	Merge branch 'sh-add-usage-ping-api-settings' into 'master'	Robert Speicher	2018-05-30	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing usage_ping_enabled to API settings See merge request gitlab-org/gitlab-ce!19263
\| * \| \| \| \| \| \| \|	Add missing usage_ping_enabled to API settings	Stan Hu	2018-05-30	1	-0/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Identified while resolving conflicts in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5906
* \| \| \| \| \| \| \|	Merge branch 'fix-nbsp-after-sign-in-with-google' into 'master'	Filipa Lacerda	2018-05-30	2	-2/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix   after sign-in with Google button Closes #45551 See merge request gitlab-org/gitlab-ce!19249