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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Resolve "Better SVG Usage in the Frontend"	Tim Zallmann	2017-09-22	3	-0/+61
\|
*	Removed two legacy config optionsvoogsgerd/gitlab-ce-daniel-legacy-config	Daniel Voogsgerd	2017-09-21	1	-6/+0
\| \| \| \| \|	Removed the max_size and timeout options from the git config in gitlab.yml.
*	Stop using Sidekiq for updating Key#last_used_atremove-use-key-worker	Yorick Peterse	2017-09-20	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes things simpler as no scheduling is involved. Further we remove the need for running a SELECT + UPDATE just to get the key and update it, whereas we only need an UPDATE when setting last_used_at directly in a request. The added service class takes care of updating Key#last_used_at without using Sidekiq. Further it makes sure we only try to obtain a Redis lease if we're confident that we actually need to do so, instead of always obtaining it. We also make sure to _only_ update last_used_at instead of also updating updated_at. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36663
*	Merge branch 'fix-rails-migrations-for-partial-indexes' into 'master'	Yorick Peterse	2017-09-19	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Fix regular expression used for opclasses to not be confused by partial index clause See merge request gitlab-org/gitlab-ce!14343
\| *	Fix regular expression used for opclasses to not be confused by partial ↵fix-rails-migrations-for-partial-indexes	Greg Stark	2017-09-19	1	-1/+1
\| \| \| \| \| \| \| \|	index clause
* \|	Detect n+1 issues involving Gitaly	Andrew Newdigate	2017-09-19	1	-1/+6
\|/
*	Merge branch '37789-followup-for-read-registry-change' into 'master'	Rémy Coutable	2017-09-18	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Clean up read_registry scope changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307
\| *	Clean up read_registry scope changes	Robin Bobbitt	2017-09-18	1	-1/+1
\| \| \| \| \| \| \| \|	Closes #37789
* \|	Merge branch 'fix-dev-ssl' into 'master'	Grzegorz Bizon	2017-09-18	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Never connect to webpack-dev-server over SSL in dev mode See merge request gitlab-org/gitlab-ce!14297
\| * \|	Never connect to webpack-dev-server over SSLfix-dev-ssl	Alessio Caiazza	2017-09-15	1	-1/+1
\| \|/
* \|	add dependency approvals (all MIT license)	Mike Greiling	2017-09-16	1	-0/+36
\|/
*	Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8	Annabel Dunstone Gray	2017-09-11	2	-0/+8
\| \| \|	This reverts merge request !14148
*	Merge branch 'sh-filter-runner-token' into 'master'	Robert Speicher	2017-09-11	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Expand filtered parameters to include `token` See merge request !14174
\| *	Expand filtered parameters to include `token`sh-filter-runner-token	Stan Hu	2017-09-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	Now that we are logging API requests in `api_json.log`, we see that the runner token was not filtered properly.
* \|	Merge branch ↵	Tim Zallmann	2017-09-11	1	-10/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37644-update-prometheus-metric-library-to-support-multiple-series-and-colors' into 'master' Update Prometheus Metric Library to support multiple series and colors Closes #37644 See merge request !14155
\| * \|	Fix ingress query	Joshua Lambert	2017-09-09	1	-2/+3
\| \| \|
\| * \|	Update k8s metrics and docs	Joshua Lambert	2017-09-08	1	-1/+1
\| \| \|
\| * \|	Update queries for colors and series	Joshua Lambert	2017-09-08	1	-10/+37
\| \| \|
* \| \|	Read import sources from setting at first initialization	Visay Keo	2017-09-09	1	-1/+1
\| \|/ \|/\|
* \|	Revert "Merge branch ↵revert-f2421b2b	Rubén Dávila	2017-09-08	2	-8/+0
\|/ \| \| \| \|	'35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
*	Merge remote-tracking branch 'origin/master' into ↵	Kamil Trzcinski	2017-09-07	4	-13/+22
\|\ \| \| \| \| \| \|	zj/gitlab-ce-zj-auto-devops-table
\| *	Merge branch ↵	Sean McGivern	2017-09-07	2	-0/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
\| \| *	Fix specs; start on light theme	Annabel Dunstone Gray	2017-09-06	1	-1/+3
\| \| \|
\| \| *	Add blue theme	Annabel Dunstone Gray	2017-09-06	1	-0/+1
\| \| \|
\| \| *	Add functionality for two themes	Annabel Dunstone Gray	2017-09-06	1	-8/+4
\| \| \|
\| \| *	Restore some changes from !9199	Rubén Dávila	2017-09-06	2	-1/+10
\| \| \|
\| * \|	Merge branch 'ee_issue_928_backport' into 'master'	Sean McGivern	2017-09-07	2	-13/+14
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Group boards CE backport See merge request !13883
\| \| *	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2017-09-06	12	-34/+41
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	ee_issue_928_backport
\| \| * \|	Group boards CE backport	Felipe Artur	2017-08-28	2	-13/+14
\| \| \| \|
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Kamil Trzcinski	2017-09-06	3	-7/+24
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \|	zj/gitlab-ce-zj-auto-devops-table
\| * \| \|	Merge branch ↵	Douwe Maan	2017-09-06	1	-3/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
\| \| * \| \|	Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-list	Tiago Botelho	2017-09-06	1	-3/+0
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Profile updates from providers	Alexander Keramidas	2017-09-06	2	-4/+24
\| \|/ /
* \| \|	Merge branch 'master' into zj-auto-devops-table	Zeger-Jan van de Weg	2017-09-06	4	-2/+15
\|\ \ \ \| \|/ /
\| * \|	Move `common_vue` into vendor bundle	kushalpandya	2017-09-05	1	-1/+1
\| \| \|
\| * \|	Merge branch 'forbid-fb-bsd-patents' into 'master'	Douwe Maan	2017-09-04	1	-0/+6
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Facebook BSD+PATENTS license to the "unacceptable" list See merge request !14029
\| \| * \|	Add Facebook BSD+PATENTS license to the "unacceptable" list	Nick Thomas	2017-09-04	1	-0/+6
\| \| \| \|
\| * \| \|	Increase the timeout before aborting a storage access attemptbvl-increase-storage-check-timeout	Bob Van Landuyt	2017-09-04	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	There are peaks of IO-wait time, most of them stay below 30 seconds.
\| * \|	Merge branch '34261-move-move-to-sidebar' into 'master'	Grzegorz Bizon	2017-09-04	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move "Move issue" to sidebar Closes #34261 See merge request !13616
\| \| * \|	Move "Move to different project" to sidebar34261-move-move-to-sidebar	Eric Eastwood	2017-09-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
\| * \| \|	Merge branch 'approve-unlicense' into 'master'	Douwe Maan	2017-09-04	1	-0/+6
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Approve the Unlicense See merge request !14001
\| \| * \|	Approve the Unlicense	Nick Thomas	2017-09-01	1	-0/+6
\| \| \| \|
* \| \| \|	Incorporate review	Zeger-Jan van de Weg	2017-09-04	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into zj-auto-devops-table	Zeger-Jan van de Weg	2017-09-04	4	-1/+8
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch 'issue-discussions-refactor' into 'master'	Jacob Schatz	2017-09-02	2	-0/+3
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Issue discussions Vue refactor See merge request !12069
\| \| * \|	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-08-31	5	-31/+14
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/issue.rb
\| \| * \ \	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-08-30	6	-7/+12
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/issue.rb
\| \| * \ \ \	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-08-23	5	-16/+13
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # package.json
\| \| * \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-08-17	12	-16/+104
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
\| \| * \ \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Filipa Lacerda	2017-08-10	4	-4/+7
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (42 commits) alternative route for download archive Add missing command to compile GetText files Prevent user from changing username with container registry tags Rename RPC 'Exists' to 'RepositoryExists' Fix the sticky changes bar on commits page Fix ee_compat_check when EE branch uses a prefix Removed display styles when hiding the fly out navigation Explain why we use select all for project_url_constrainer.rb Fix pikaday being undefined Add a helper to stub storage settings with defaults Enable the Layout/SpaceBeforeBlockBraces cop update Install from Source instructions Translations can be picked without asking for exceptions Ask for exceptions in advance Don't require stackprof in Gemfile Synchronous Korean translation in zanata Use full path of user's avatar in webhooks Update icon color on hover Align all nav items in sidebar Fix height of collapsed sidebar items ...