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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add examples for array and hash type API paramsdocs-add-api-params-array-hash	Athar Hameed	2018-07-12	1	-1/+31
\|
*	Merge branch '20700-use-danger-gem' into 'master'	Robert Speicher	2018-07-11	9	-0/+252
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Use Danger gem" Closes #20700 See merge request gitlab-org/gitlab-ce!19066
\| *	Autocorrect RuboCop violations in danger/**/Dangerfile	Robert Speicher	2018-07-11	5	-12/+5
\| \|
\| *	Wrap DB paths in backticks in the Danger check	Rémy Coutable	2018-07-11	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Revert "Modify locale/gitlab.pot for debugging purpose"	Rémy Coutable	2018-07-11	1	-8/+13
\| \| \| \| \| \| \| \|	This reverts commit dc629bb6b8146477fdbf9fcd11d10ebedc785029.
\| *	Revert "Moving 400 lines of code"	Rémy Coutable	2018-07-11	2	-315/+13
\| \| \| \| \| \| \| \|	This reverts commit 1915c9f0cf1ec3e836c02ba57c97e5a9a61d487b.
\| *	Revert "Add a fake change to Gemfile"	Rémy Coutable	2018-07-11	1	-2/+0
\| \| \| \| \| \| \| \|	This reverts commit 867018aab4fe2a305ebc58193da5c19e72827ddf.
\| *	Revert "Add a new fake migration file"	Rémy Coutable	2018-07-11	1	-0/+0
\| \| \| \| \| \| \| \|	This reverts commit eff378ca1a317877f168b76658d81b38d4d9f02e.
\| *	Fix "Database Team" typo for Danger	Yorick Peterse	2018-07-11	1	-1/+1
\| \|
\| *	Tweak the Danger settings for DB changes	Yorick Peterse	2018-07-11	1	-8/+61
\| \| \| \| \| \| \| \| \| \| \| \|	Instead of only checking for migrations, we now check for a variety of files and directories that require a database review. We also include some steps on how to make sure changes are reviewed.
\| *	Improve Danger files after first review	Rémy Coutable	2018-07-11	7	-49/+117
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Modify locale/gitlab.pot for debugging purpose	Rémy Coutable	2018-07-11	1	-13/+8
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Moving 400 lines of code	Rémy Coutable	2018-07-11	2	-13/+315
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Add a fake change to Gemfile	Rémy Coutable	2018-07-11	1	-0/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Add a new fake migration file	Rémy Coutable	2018-07-11	1	-0/+0
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| *	Start to use Danger for automating MR reviews	Rémy Coutable	2018-07-11	9	-0/+138
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '48934' into 'master'	Mike Greiling	2018-07-11	5	-2/+29
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #48934 - Focus on text input on danger confirmation Closes #48934 See merge request gitlab-org/gitlab-ce!20435
\| * \|	Fix #48934 - Focus on text input on danger confirmation	Jamie Schembri	2018-07-06	5	-2/+29
\| \| \|
* \| \|	Merge branch ↵	Grzegorz Bizon	2018-07-11	2	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'49021-preserve-test-run-artifacts-when-running-gitlab-qa-multiple-times' into 'master' Resolve "Preserve test run artifacts when running gitlab-qa multiple times" Closes #49021 See merge request gitlab-org/gitlab-ce!20495
\| * \| \|	[QA] Ensure screenshots are save in subfolder per QA run	Rémy Coutable	2018-07-11	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'sh-truncate-changelog-filenames' into 'master'	Robert Speicher	2018-07-11	2	-4/+24
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate filenames created by bin/changelog to 140 characters See merge request gitlab-org/gitlab-ce!20556
\| * \| \| \|	Truncate filenames created by bin/changelog to 140 characters	Stan Hu	2018-07-11	2	-4/+24
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-mr-widget-border' into 'master'	Filipa Lacerda	2018-07-11	2	-7/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MR widget border See merge request gitlab-org/gitlab-ce!20562
\| * \| \| \| \|	Fix MR widget border	Annabel Dunstone Gray	2018-07-11	2	-7/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'revert-todos-epic' into 'master'	Yorick Peterse	2018-07-11	30	-640/+184
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'ee-5481-epic-todos' into 'master'" See merge request gitlab-org/gitlab-ce!20560
\| * \| \| \|	Revert "Merge branch 'ee-5481-epic-todos' into 'master'"	Jarka Kadlecová	2018-07-11	30	-640/+184
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* \| \| \|	Merge branch 'fix-no-method-error-on-nil' into 'master'	Kamil Trzciński	2018-07-11	2	-1/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an exception seen using the online terminal See merge request gitlab-org/gitlab-ce!18299
\| * \| \| \|	Fix an exception seen using the online terminal	Nick Thomas	2018-07-11	2	-1/+21
\| \| \| \| \|
* \| \| \| \|	Merge branch '48237-toggle-file-comments' into 'master'	Phil Hughes	2018-07-11	14	-92/+378
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Toggle file comments in merge request does not update toggle buttons" Closes #48237 and #48537 See merge request gitlab-org/gitlab-ce!20452
\| * \| \| \| \|	Adds specs for toggleFileDiscussions action	Filipa Lacerda	2018-07-11	2	-3/+45
\| \| \| \| \| \|
\| * \| \| \| \|	Adds specs for getters in merge request vuex diff module	Filipa Lacerda	2018-07-11	3	-95/+30
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into 48237-toggle-file-comments	Filipa Lacerda	2018-07-10	319	-1960/+2700
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (38 commits) Update bitbucket.md to fix typo and small grammar touchups. Update time_helper.rb to fix output for exact minutes. Document update for GitLab Pages users. Support manually stopping any environment from the UI Fix link to frontend in handbook Shorten CHANGELOG filename to avoid breaking ecryptfs users Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml Fix mountComponent helper path in docs Fix #48537 - Update avatar only via the projects API Add additional headline for Adding SSH keys to GitLab Request to be a proofreader. Fix specs Fix search bar text input alignment Fix API docs on unauthenticated projects return Adds with_projects optional parameter to /groups/:id API endpoint Docs: make it clear that you need a completely separate domain for Pages Document that we don't want to wait in tests Removes unused store in diffs mr refactor Removes double export for actions in diffs module in mr refactor Remove useless return Use latest gitlab-styles ...
\| * \| \| \| \| \|	Fixes toggle discussion button not expanding collapsed discussions	Filipa Lacerda	2018-07-10	7	-6/+94
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discussions were being toggled by jquery DOM querying them and toggling visibility but in vue, only the open discussions will be in the DOM Fix includes: - Adds a getter to the store to get the expanded discussions - Adds an action to collapse a discussion - When the user clicks the button, all data needed is now accessible through a getter and we can dispatch an action to toggle the discussion within the state, instead of showing/hiding with jQuery - Removes hardcoded properties Resolves #48237
\| * \| \| \| \| \|	Removes hardcoded and unused prop	Filipa Lacerda	2018-07-09	1	-4/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'milestone-tests' into 'master'	Rémy Coutable	2018-07-11	16	-18/+151
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestone tests Closes gitlab-qa#231 See merge request gitlab-org/gitlab-ce!20111
\| * \| \| \| \| \| \|	Milestone tests	Dan Davison	2018-07-11	16	-18/+151
\|/ / / / / / /
* \| \| \| \| \| \|	Fix long changelog file name	Sean McGivern	2018-07-11	1	-0/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '42751-rename-master-to-maintainer-2' into 'master'	Dmitriy Zaporozhets	2018-07-11	495	-1596/+1631
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Rename the `Master` role to `Maintainer`" Backend Closes #42751 See merge request gitlab-org/gitlab-ce!19413
\| * \| \| \| \| \| \|	Resolve "Rename the `Master` role to `Maintainer`" Backend	Mark Chao	2018-07-11	495	-1596/+1631
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '49114-add-gitaly-servers-to-admin-overview-navigation-menu' ↵	Douwe Maan	2018-07-11	2	-2/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Add Gitaly Servers to Admin > Overview navigation menu" Closes #49114 See merge request gitlab-org/gitlab-ce!20550
\| * \| \| \| \| \| \|	Add Gitaly Servers to Admin > Overview menu49114-add-gitaly-servers-to-admin-overview-navigation-menu	Gabriel Mazetto	2018-07-11	2	-2/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-07-11	3	-8/+42
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'45592-nomethoderror-undefined-method-commit-for-nil-nilclass-in-sidekiq-caused-by-a-merge-commit-in-a-forked-project-with-upstream-project-deleted' into 'master' Resolve "NoMethodError: undefined method `commit' for nil:NilClass in sidekiq caused by a merge commit in a forked project with upstream project deleted." Closes #45592 See merge request gitlab-org/gitlab-ce!20534
\| * \| \| \| \| \| \| \|	Fix ProcessCommitWorker when upstream project is deleted	Sean McGivern	2018-07-10	3	-8/+42
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-bump-gitlab-shell' into 'master'	Douwe Maan	2018-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell to 7.1.5 See merge request gitlab-org/gitlab-ce!20545
\| * \| \| \| \| \| \| \| \|	Bump gitlab-shell to 7.1.5	Stan Hu	2018-07-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes a NoMethodError in the pre-receive hook: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/206
* \| \| \| \| \| \| \| \| \|	Merge branch 'make-sure-env-name-not-ending-in-slash' into 'master'	Nick Thomas	2018-07-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid building potential invalid environment name while seeding See merge request gitlab-org/gitlab-ce!20523
\| * \| \| \| \| \| \| \| \| \|	Make sure we're matching the same way.	Lin Jen-Shin	2018-07-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby's regular expression is unicode aware, therefore 'å' also matches against /\p{alnum}/. If we want only ASCII-7bit, use [a-zA-Z0-9]+ so they always match the same thing
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-0.112.0' into 'master'	Sean McGivern	2018-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly 0.112.0 See merge request gitlab-org/gitlab-ce!20548
\| * \| \| \| \| \| \| \| \| \| \|	Use gitaly 0.112.0	Jacob Vosmaer	2018-07-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-back-mr-diff-deletion-migration' into 'master'	Yorick Peterse	2018-07-11	6	-54/+224
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add back MR diff deletion migration See merge request gitlab-org/gitlab-ce!20331