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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixes the spacing around diff discussion buttonsdiff-discussion-buttons-spacing	Phil Hughes	2017-04-24	2	-0/+5
\| \| \| \|	Closes #31102
*	Merge branch 'rs-rename-login_as' into 'master'	Rémy Coutable	2017-04-24	9	-18/+74
\|\ \| \| \| \| \| \| \| \|	Except where necessary, use `sign_in` over `login_as` in features See merge request !10320
\| *	Return early from `finished_all_ajax_requests?` when jQuery is undefinedrs-rename-login_as	Robert Speicher	2017-04-19	1	-0/+1
\| \|
\| *	Simplify the `javascript_test?` helper	Robert Speicher	2017-04-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \|	Also don't try to run `page.evaluate_script` when we're not in a JavaScript test.
\| *	Except where necessary, use `sign_in` over `login_as` in features	Robert Speicher	2017-04-19	7	-13/+70
\| \|
\| *	Remove unused `skip_ci_admin_auth` helper	Robert Speicher	2017-04-19	1	-4/+0
\| \|
* \|	Merge branch 'workhorse-secret-path' into 'master'	Rémy Coutable	2017-04-24	3	-1/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make location of gitlab_workhorse_secret configurable See merge request !10357
\| * \|	Make location of gitlab_workhorse_secret configurable	Jakub Jirutka	2017-04-19	3	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hard-coding location of configuration files is very bad practice. This patch applies the same approach as currently used for gitlab_shell_secret file.
* \| \|	Merge branch 'add_index_on_ci_builds_updated_at' into 'master'	Yorick Peterse	2017-04-24	3	-1/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index on ci_builds.updated_at Closes #31251 See merge request !10870
\| * \| \|	Add index on ci_builds.updated_at	blackst0ne	2017-04-23	3	-1/+25
\| \| \| \|
* \| \| \|	Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into ↵	Yorick Peterse	2017-04-24	4	-11/+97
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add a transaction around `move_issues_to_ghost_user` See merge request !10465
\| * \| \| \|	Add changelog entry for !1046530306-transaction-while-moving-issues-to-ghost-user	Timothy Andrew	2017-04-24	1	-0/+4
\| \| \| \| \|
\| * \| \| \|	Move records to the ghost user in a transaction.	Timothy Andrew	2017-04-24	3	-11/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- While deleting a user, some of the user's associated records are moved to the ghost user so they aren't deleted. The user is blocked before these records are moved, to prevent the user from creating new records while the migration is happening, and so preventing a data race. - Previously, if the migration failed, the user would _remain_ blocked, which is not the expected behavior. On the other hand, we can't just stick the block + migration into a transaction, because we want the block to be committed before the migration starts (for the data race reason mentioned above). - One solution (implemented in this commit) is to block the user in a parent transaction, migrate the associated records in a nested sub-transaction, and then unblock the user in the parent transaction if the sub-transaction fails.
* \| \| \| \|	Merge branch 'fix_link_in_readme' into 'master'	Rémy Coutable	2017-04-24	2	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wrong link to GDK in README file Closes #30817 See merge request !10701
\| * \| \| \| \|	Fix wrong link to GDK in README file	dixpac	2017-04-15	2	-1/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'mention-new-frontend-fixtures' into 'master'	Rémy Coutable	2017-04-24	1	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention new mechanism to generate frontend fixtures See merge request !10706
\| * \| \| \| \| \|	Mention new mechanism to generate frontend fixtures	Winnie Hellmann	2017-04-14	1	-2/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '29801-add-slash-slack-commands-to-api-doc' into 'master'	Sean McGivern	2017-04-24	2	-11/+73
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[#29801] Add "Slack Slash Commands" to API docs Closes #29801 See merge request !10757
\| * \| \| \| \| \| \|	[#29801] Add "Slack Slash Commands" to API docs	TM Lee	2017-04-24	2	-11/+73
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Reorder slash command api requests, include slack response example - Case fix and added changelog
* \| \| \| \| \| \|	Merge branch 'master' into 'master'	Sean McGivern	2017-04-24	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update plantuml.md Fix wrong order when restarting tomcat service [ci skip] See merge request !10855
\| * \| \| \| \| \| \|	Update plantuml.md Fix wrong order when restarting tomcat service [ci skip]	Vladimir Tasic	2017-04-21	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '31072-activity-border' into 'master'	Phil Hughes	2017-04-24	2	-2/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix border color on activities page Closes #31072 See merge request !10864
\| * \| \| \| \| \| \|	Fix border color on activities page31072-activity-border	Annabel Dunstone Gray	2017-04-21	2	-2/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'submodules-no-dotgit' into 'master'	Dmitriy Zaporozhets	2017-04-22	3	-9/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	submodule_links: handle urls that don't end with .git See merge request !10799
\| * \| \| \| \| \| \| \|	submodule_links: handle urls that don't end with .git	David Turner	2017-04-21	3	-9/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: David Turner <novalis@novalis.org>
* \| \| \| \| \| \| \| \|	Update VERSION to 9.2.0-prev9.2.0.pre	Felipe Artur	2017-04-22	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.1.0	Felipe Artur	2017-04-22	234	-941/+248
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'backup-restore-docs-update' into 'master'	Marcia Ramos	2017-04-22	1	-4/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reword backup & restore secrets description See merge request !10753
\| * \| \| \| \| \| \| \| \|	Reword backup & restore secrets descriptionbackup-restore-docs-update	Cindy Pallares	2017-04-20	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The new description will make it more clear that there are 3 separate things being affected and not just 2FA.
* \| \| \| \| \| \| \| \| \|	Merge branch 'dm-fix-project-import' into 'master'	Robert Speicher	2017-04-21	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Git repository URL field on New Project page See merge request !10803
\| * \| \| \| \| \| \| \| \| \|	Disable import URL field in New project form since it's hidden by default	Douwe Maan	2017-04-21	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Achilleas Pipinellis	2017-04-21	2	-2/+32
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31265-update-auto-deploy-documentation-for-postgres-and-private-project-support' into 'master' Update Auto Deploy documentation Closes #31265 See merge request !10859
\| * \| \| \| \| \| \| \| \| \| \|	Update Auto Deploy documentation	Joshua Lambert	2017-04-21	2	-2/+32
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-burndown-chart-reference-from-docs' into 'master'	Felipe Artur	2017-04-21	1	-3/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove reference to burndown charts since they don't exist for ce. See merge request !10861
\| * \| \| \| \| \| \| \| \| \|	Remove reference to burndown charts since they don't exist for ce.remove-burndown-chart-reference-from-docs	Victor Wu	2017-04-21	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '30618-change-placeholder-color' into 'master'	Annabel Dunstone Gray	2017-04-21	2	-0/+30
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix placeholder visibility Closes #30618 See merge request !10804
\| * \| \| \| \| \| \| \| \| \| \|	fix placeholder visibility	Andy	2017-04-21	2	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sentinel-psswd-docs' into 'master'	Achilleas Pipinellis	2017-04-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use master_password for Sentinel See merge request !10857
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] Use master_password for Sentinel	Jose Torres	2017-04-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '30672-versioned-markdown-cache' into 'master'	Douwe Maan	2017-04-21	12	-251/+343
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Start versioning cached markdown fields Closes #30672 See merge request !10597
\| * \| \| \| \| \| \| \| \| \| \|	Start versioning cached markdown fields	Nick Thomas	2017-04-21	8	-169/+329
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove the ClearDatabaseCacheWorker	Nick Thomas	2017-04-21	5	-70/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix Gitlab::Metrics metaprogramming magic	Nick Thomas	2017-04-21	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On initial startup with no rows in the application_settings table, the metaprogramming call to `if enabled?` attempts to create a row. This triggers the HTML caching path, which attempts to store metrics. At this point, not all the methods in `Gitlab::Metrics` have been defined! Move `current_transaction` to be defined before running the metaprogramming, to avoid a confusing NoMethodError
\| * \| \| \| \| \| \| \| \| \| \|	Remove a use of module_function	Nick Thomas	2017-04-21	1	-12/+10
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dz-cleanup-add-users' into 'master'	Douwe Maan	2017-04-21	9	-32/+53
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor add_users method for project and group See merge request !10850
\| * \| \| \| \| \| \| \| \| \| \|	Refactor add_users method for project and groupdz-cleanup-add-users	Dmitriy Zaporozhets	2017-04-21	9	-32/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'resolvable-discussions-docs' into 'master'	Achilleas Pipinellis	2017-04-21	19	-108/+154
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	discussions docs See merge request !10390
\| * \| \| \| \| \| \| \| \| \| \| \|	Refactor Discussions docs	Achilleas Pipinellis	2017-04-21	19	-71/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Move to dicsussions/index.md - Bring back previous path with a link to new location - Reorder sections
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix broken link	Luke "Jared" Bennett	2017-04-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Added new discussions docs	Luke "Jared" Bennett	2017-04-21	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|