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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove now unused KubernetesService methodsremove_unused_k8s_service_methods	James Fargher	2019-07-05	2	-134/+2
\| \| \| \| \|	Now that KubernetesService can no longer be a DeploymentPlatform we can remove all kubernetes client code and KubernetesService edge cases.
*	Merge branch '54117-transactional-rebase' into 'master'	Douglas Barbosa Alexandre	2019-07-04	4	-3/+33
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Allow asynchronous rebase operations to be monitored Closes #54117 See merge request gitlab-org/gitlab-ce!29940
\| *	Allow asynchronous rebase operations to be monitored	Nick Thomas	2019-07-04	4	-3/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This MR introduces tracking of the `rebase_jid` for merge requests. As with `merge_ongoing?`, `rebase_in_progress?` will now return true if a rebase is proceeding in sidekiq. After one release, we should remove the Gitaly-based lookup of rebases. It is much better to track this kind of thing via the database.
* \|	Implements lease_release on NamespaceAggregation	Mayra Cabrera	2019-07-04	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sets lease_release? to false to prevent the job to be re-executed more often than lease timeout Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64079
* \|	Change 'Todo' to 'To Do'	Christie Lenneville	2019-07-04	9	-24/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, we label items to be done as "Todo." This is grammatically incorrect and (therefore) confusing—especially to our Spanish-speaking users for whom "todo" has a specific and unrelated meaning. We should use "To Do" and always use it as singular (not "To Dos"). Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot
* \|	Merge branch '12556-flash-message' into 'master'	Phil Hughes	2019-07-04	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes EE differences for app/views/projects/_flash_messages.html.haml Closes gitlab-ee#12556 See merge request gitlab-org/gitlab-ce!30344
\| * \|	Removes EE differences12556-flash-message	Filipa Lacerda	2019-07-04	1	-0/+1
\| \|/
* \|	Copy content from BoardService to boardsStore	Winnie Hellmann	2019-07-04	3	-59/+131
\| \| \| \| \| \| \| \|	(cherry picked from commit 813299edd83ace98256b7fc9302f586f0dc2cabc)
* \|	Create EE-specific initNewListDropdown() function	Winnie Hellmann	2019-07-04	1	-1/+1
\| \| \| \| \| \| \| \|	(cherry picked from commit 844666193f0740ab9c5f91d60d61acb6ce14cfaf)
* \|	Merge branch '12368-main-js' into 'master'	Phil Hughes	2019-07-04	2	-0/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diff in main.js See merge request gitlab-org/gitlab-ce!30347
\| * \|	Resolve CE/EE diff in main.js12368-main-js	Lukas Eipert	2019-07-04	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moving ee/main.js to ee/main_ee.js allows to add a noop file in CE and utilize ee_else_ce.
* \| \|	Merge branch 'nfriend-make-haml-tooltip-delay-user-configurable' into 'master'	Fatih Acet	2019-07-04	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow vanilla JS tooltip delay to be customized through localStorage See merge request gitlab-org/gitlab-ce!30196
\| * \| \|	Allow (Haml) tooltip delay customization via localStoragenfriend-make-haml-tooltip-delay-user-configurable	Nathan Friend	2019-06-28	1	-0/+4
\| \| \| \|
* \| \| \|	Merge branch 'refactor-pipeline-errors_message-ce' into 'master'	Kamil Trzciński	2019-07-04	2	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port: Refactor pipeline errors_message See merge request gitlab-org/gitlab-ce!30116
\| * \| \| \|	Refactor pipeline errors_messagerefactor-pipeline-errors_message-ce	Shinya Maeda	2019-07-04	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the shared method in Ci::Pipeline
* \| \| \| \|	Extract mounting of multiple boards switcher	Winnie Hellmann	2019-07-04	2	-0/+5
\| \| \| \| \|
* \| \| \| \|	Vue-i18n: app/assets/javascripts/sidebar directory	Ezekiel Kigbo	2019-07-04	7	-28/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/sidebar directory
* \| \| \| \|	Vue-i18n: app/assets/javascripts/notes directory	Ezekiel Kigbo	2019-07-04	9	-50/+90
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n linting for .vue files under the app/assets/javascripts/notes directory
* \| \| \|	Set default project sort method prior to initial sort on page loading	David Palubin	2019-07-04	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-mwps-shows-inconsistent-sha-ce' into 'master'	Douwe Maan	2019-07-04	2	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port: Fix MWPS/ADMTWPS system notes shows wrong sha See merge request gitlab-org/gitlab-ce!30160
\| * \| \| \|	Fix MWPS system notes shows inconsistent shafix-mwps-shows-inconsistent-sha-ce	Shinya Maeda	2019-07-04	2	-3/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Fix the system note service
* \| \| \|	Backports for EE's "Allow adding groups to CODEOWNERS file"	Igor	2019-07-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some general code has been added/removed in EE version which needs to be backported in CE
* \| \| \|	Merge branch 'little-cluster-health-charts-ce' into 'master'	Phil Hughes	2019-07-04	2	-37/+34
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Use gl-empty-state for monitor charts See merge request gitlab-org/gitlab-ce!30268
\| * \| \|	Use gl-empty-state for monitor chartslittle-cluster-health-charts-ce	Simon Knox	2019-07-04	2	-37/+34
\| \|/ / \| \| \| \| \| \| \| \| \|	Move a unit test to jest and use snapshot tests
* \| \|	Merge branch 'sh-fix-issue-63349' into 'master'	Rémy Coutable	2019-07-04	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Housekeeping button do a full garbage collection Closes #63349 See merge request gitlab-org/gitlab-ce!30289
\| * \| \|	Make Housekeeping button do a full garbage collectionsh-fix-issue-63349	Stan Hu	2019-07-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the Housekeeping button and API would use the counter of last pushes to determine whether to do a full garbage collection, or whether to do one of the less comprehensive tasks: a full repack, incremental pack, or ref pack. This was confusing behavior, since a project owner might have to click the button dozens of times before a full GC would be initiated. This commit forces a full GC each time this is initiated. Note that the `ExclusiveLease` in `HousekeepingService` prevents users from clicking on the button more than once a day. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63349
* \| \| \|	Merge branch '53357-fix-plus-in-upload-file-names' into 'master'	Lin Jen-Shin	2019-07-04	2	-2/+2
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Use GitlabUploader#filename when generating upload URLs See merge request gitlab-org/gitlab-ce!29915
\| * \| \|	Use #filename when generating upload URLs53357-fix-plus-in-upload-file-names	Heinrich Lee Yu	2019-07-04	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't need to find the filename from the remote URL
* \| \| \|	Merge branch 'limit-amount-of-tests-returned' into 'master'	Stan Hu	2019-07-03	2	-4/+31
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit amount of JUnit tests returned Closes #64035 See merge request gitlab-org/gitlab-ce!30274
\| * \| \|	Limit amount of JUnit tests returned	Kamil Trzciński	2019-07-03	2	-4/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, we do not cap amount of tests returned to frontend, thus in some extreme cases we can see a MBs of data stored in Redis. This adds an upper limit of 100 tests per-suite. We will continue showing the total counters correctly, but we will limit amount of tests that will be presented.
* \| \| \|	Add Grafana to Admin > Monitoring menu when enabled	Maneschi Romain	2019-07-03	4	-0/+35
\| \| \| \|
* \| \| \|	Add salesforce logo	Małgorzata Ksionek	2019-07-03	2	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '55487-enable-group-terminals-button' into 'master'	Fatih Acet	2019-07-03	1	-11/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable terminals button for group clusters Closes #55487 See merge request gitlab-org/gitlab-ce!30255
\| * \| \| \|	Enable terminals button for group clusters55487-enable-group-terminals-button	Tiger	2019-07-02	1	-11/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-todo-allow_collaboration' into 'master'	Dmitriy Zaporozhets	2019-07-03	1	-0/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update TODO: allow_collaboration column renaming See merge request gitlab-org/gitlab-ce!30291
\| * \| \| \| \|	Update TODO: allow_collaboration column renamingfix-todo-allow_collaboration	Mark Chao	2019-07-03	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue/55953' into 'master'	Sean McGivern	2019-07-03	14	-35/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rename `discussion` to `thread` Closes #55953 See merge request gitlab-org/gitlab-ce!29553
\| * \ \ \ \ \	Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953	Sean McGivern	2019-07-03	66	-350/+919
\| \|\ \ \ \ \ \ \| \| \|/ / / / /
\| * \| \| \| \| \|	replaced `discussion` with `thread` in comment button	Michel Engelen	2019-07-02	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	prettified noteable_discussion component and updated tests	Michel Engelen	2019-07-02	1	-3/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	replaced string `discussion` with `thread` in issuable-form template	Michel Engelen	2019-07-02	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	replaced string `discussion` wit `thread` in noteable-discussion component	Michel Engelen	2019-07-02	1	-6/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	replaced string `discussion` wit `thread` in comment-button template	Michel Engelen	2019-07-02	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	replaced string `discussion` wit `thread` in discussion template	Michel Engelen	2019-07-02	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	replaced string `discussion` wit `thread` in note-form component	Michel Engelen	2019-07-02	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	replaced string `discussion` with string `thread` in mr-widget component state	Michel Engelen	2019-07-02	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	replaced string `discussion` with string `thread` in thread header	Michel Engelen	2019-07-02	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	renamed `discussion` to `thread` in popover from reply form button	Michel Engelen	2019-07-02	2	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	changed string `discussion` to `thread` in timeline update ("[user] resolved ↵	Michel Engelen	2019-07-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	all threads")
\| * \| \| \| \| \|	changed string `discussion` to `thread` in discussion (thread) counter	Michel Engelen	2019-07-02	1	-3/+3
\| \| \| \| \| \| \|