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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable 5 lines of Sidekiq backtrace lines to aid in debuggingsh-sidekiq-backtrace	Stan Hu	2017-08-25	6	-0/+13
\| \| \| \| \| \| \| \| \| \|	Customers often have Sidekiq jobs that failed without much context. Without Sentry, there's no way to tell where these exceptions were hit. Adding in additional lines adds a bit more Redis storage overhead. This commit adds in backtrace logging for workers that delete groups/projects and import/export projects. Closes #27626
*	Merge branch '31409-fix-group-and-project-search-for-anonymous-users' into ↵	Kamil Trzciński	2017-08-25	10	-32/+128
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix group and project search for anonymous users Closes #31409 See merge request !13745
\| *	Refactor complicated API group finding rules into GroupsFinder	Nick Thomas	2017-08-24	2	-16/+32
\| \|
\| *	Fix group and project search for anonymous users	Nick Thomas	2017-08-24	8	-15/+95
\| \|
\| *	Allow v4 API GET requests for groups to be unauthenticated	Nick Thomas	2017-08-23	1	-4/+4
\| \|
* \|	Merge branch '35811-copy-link-note' into 'master'	Tim Zallmann	2017-08-25	5	-12/+92
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for copying permalink to notes via more actions dropdown Closes #35811 See merge request !13299
\| * \|	Add support for copying permalink to notes via more actions dropdown	Dimitrie Hoekstra	2017-08-25	5	-12/+92
\|/ /
* \|	Merge branch 'backstage/gb/improve-stages-statuses-migration' into 'master'	Kamil Trzciński	2017-08-25	2	-7/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust a range and a batch sizes in stages statuses migration Closes #36793 See merge request !13767
\| * \|	Decrease statuses batch size even more in a migration	Grzegorz Bizon	2017-08-25	1	-1/+1
\| \| \|
\| * \|	Adjust a range and a size in stages statuses migrationbackstage/gb/improve-stages-statuses-migration	Grzegorz Bizon	2017-08-23	2	-7/+8
\| \| \|
* \| \|	Merge branch '36860-deleted-user-fix' into 'master'	Sean McGivern	2017-08-25	5	-12/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failure when issue author is nil See merge request !13807
\| * \| \|	Fix failure when issue author is nil	Jarka Kadlecova	2017-08-25	5	-12/+35
\| \| \| \|
* \| \| \|	Merge branch 'docs-article-gitlab-on-azure-1' into 'master'	Achilleas Pipinellis	2017-08-25	1	-13/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: update - fix headers See merge request !13819
\| * \| \| \|	Docs: update - fix headers	Marcia Ramos	2017-08-25	1	-13/+13
\|/ / / /
* \| \| \|	Merge branch '36939-fix-find-blobs-by-path' into 'master'	Sean McGivern	2017-08-25	3	-14/+48
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix searching for files by path Closes #36939 See merge request !13798
\| * \| \| \|	Fix searching for files by path	Nick Thomas	2017-08-25	3	-14/+48
\| \| \| \| \|
* \| \| \| \|	Merge branch 'remove-ci-api-leftovers' into 'master'	Kamil Trzciński	2017-08-25	1	-14/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove leftover API helper for removed CI API See merge request !13804
\| * \| \| \| \|	Remove leftover API helper for removed CI APIremove-ci-api-leftovers	Robert Schilling	2017-08-24	1	-14/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'revert-appearances-description-html-not-null' into 'master'	Douwe Maan	2017-08-25	4	-3/+26
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-allow appearances.description_html to be NULL Closes #36919 See merge request !13806
\| * \| \| \| \| \|	Re-allow appearances.description_html to be NULLrevert-appearances-description-html-not-null	Yorick Peterse	2017-08-24	4	-3/+26
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This column isn't always set (e.g. when upgrading from older instances) and technically it could be NULL (e.g. when flushing the cache). Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36919
* \| \| \| \| \|	Merge branch 'fix/gb/fix-invalid-stage-status-transition' into 'master'	Kamil Trzciński	2017-08-25	2	-0/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set a default CI/CD status when it is not known Closes #36790 See merge request !13737
\| * \| \| \| \| \|	Set a default CI/CD status when it is not knownfix/gb/fix-invalid-stage-status-transition	Grzegorz Bizon	2017-08-22	2	-0/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '36937-fix-invite-by-email-text' into 'master'	Tim Zallmann	2017-08-25	2	-3/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invite by email address duplication Closes #36937 See merge request !13826
\| * \| \| \| \| \| \|	Fix invite by email address duplication	Mark Fletcher	2017-08-25	2	-3/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'gitaly-gem-rename' into 'master'	Sean McGivern	2017-08-25	2	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use gitaly-proto 0.31.0 See merge request !13795
\| * \| \| \| \| \| \| \|	Use gitaly-proto 0.31.0gitaly-gem-rename	Jacob Vosmaer	2017-08-24	2	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'zj-reword-job-to-pipeline-chart-view' into 'master'	Douwe Maan	2017-08-25	4	-17/+22
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reword job to pipeline on the chart view Closes #36928 See merge request !13786
\| * \| \| \| \| \| \| \| \|	Reword job to pipeline on the chart view	Zeger-Jan van de Weg	2017-08-24	4	-17/+22
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This got changed for i18n in !12480, however, I forgot to understand that the meaning of the graphs changed in !12378. This corrects the behaviour.
* \| \| \| \| \| \| \| \|	Revert "Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'"	Douwe Maan	2017-08-25	2	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !13812
* \| \| \| \| \| \| \| \|	Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'	Douwe Maan	2017-08-25	2	-19/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reenable MySQL tests on all CE and EE branches Closes #36384 See merge request !13812
\| * \| \| \| \| \| \| \| \|	Reenable MySQL tests on all branches	Michael Kozono	2017-08-24	2	-19/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To protect master from surprise failures, as long as we continue to support MySQL.
* \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'sh-sidekiq-backtrace' into 'master'"	Robert Speicher	2017-08-25	6	-13/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !13813
* \| \| \| \| \| \| \| \| \|	Add missing third argument to `Git::Repository#initialize` in spec	Robert Speicher	2017-08-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs-article-gitlab-on-azure' into 'master'	Achilleas Pipinellis	2017-08-24	32	-2/+450
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New doc: how to install GitLab on Azure See merge request !13811
\| * \| \| \| \| \| \| \| \| \|	New doc: how to install GitLab on Azure	Marcia Ramos	2017-08-24	32	-2/+450
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-fix-master' into 'master'	Stan Hu	2017-08-24	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `:nested_groups` metadata to `Groups::NestedCreateService` specs See merge request !13809
\| * \| \| \| \| \| \| \| \| \|	Add `:nested_groups` metadata to `Groups::NestedCreateService` specs	Robert Speicher	2017-08-24	1	-2/+2
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-sidekiq-backtrace' into 'master'	Robert Speicher	2017-08-24	6	-0/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable 5 lines of Sidekiq backtrace lines to aid in debugging Closes #27626 See merge request !13813
\| * \| \| \| \| \| \| \| \|	Enable 5 lines of Sidekiq backtrace lines to aid in debugging	Stan Hu	2017-08-24	6	-0/+13
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Customers often have Sidekiq jobs that failed without much context. Without Sentry, there's no way to tell where these exceptions were hit. Adding in additional lines adds a bit more Redis storage overhead. This commit adds in backtrace logging for workers that delete groups/projects and import/export projects. Closes #27626
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-alternative-fix-ldap-login' into 'master'docs-36116-install-gitlab-on-azure	Douwe Maan	2017-08-24	3	-14/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Alternative fix for 422 when using standard login with ldap enabled See merge request !13103
\| * \| \| \| \| \| \| \| \|	Define ldap methods at runtime	Bob Van Landuyt	2017-08-24	3	-14/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids loading the `OmniAuthCallbacksController` at boot time so it doesn't mess up the `before_action`-chain
* \| \| \| \| \| \| \| \| \|	Merge branch '36589-hide-group-name-on-collapse' into 'master'	Clement Ho	2017-08-24	5	-7/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide group title on sidebar collapse; use more generic class for titles Closes #36589 See merge request !13777
\| * \| \| \| \| \| \| \| \| \|	Hide group title on sidebar collapse; use more generic class for titles36589-hide-group-name-on-collapse	Annabel Dunstone Gray	2017-08-23	5	-7/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-remove-underscore-rails' into 'master'	Clement Ho	2017-08-24	2	-5/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove underscore-rails gem Closes #36712 See merge request !13781
\| * \| \| \| \| \| \| \| \| \| \|	Remove underscore-rails gemrs-remove-underscore-rails	Robert Speicher	2017-08-23	2	-5/+0
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now manage this dependency in Yarn.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'git-operation-user' into 'master'	Sean McGivern	2017-08-24	37	-127/+180
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move GitHooksService into Gitlab::Git See merge request !13739
\| * \| \| \| \| \| \| \| \| \|	Avoid committer = linesgit-operation-user	Jacob Vosmaer	2017-08-24	2	-21/+11
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add tests for Committer#==	Jacob Vosmaer	2017-08-23	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix Hook.new call sites in tests	Jacob Vosmaer	2017-08-23	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Rubocop whitespace	Jacob Vosmaer	2017-08-23	2	-9/+8
\| \| \| \| \| \| \| \| \| \| \|