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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-award-emoji-spec' into 'master'	Rémy Coutable	2017-07-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id` Closes gitlab-ee#2890 See merge request !12770
\| * \| \| \| \| \| \| \| \|	Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`sh-fix-award-emoji-spec	Stan Hu	2017-07-10	1	-2/+2
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-ee#2890
* \| \| \| \| \| \| \| \|	Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'	Rémy Coutable	2017-07-11	3	-6/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump knapsack to 1.14.0 Closes #34902 See merge request !12753
\| * \| \| \| \| \| \| \| \|	Bump knapsack to 1.14.0	Takuya Noguchi	2017-07-11	3	-6/+6
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '34928_techguru_undo_regression' into 'master'	Stan Hu	2017-07-11	4	-3/+62
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repair Regression caused by - !11573 See merge request !12775
\| * \| \| \| \| \| \| \|	Repair Regression caused by - !11573	Paul Charlton	2017-07-11	4	-3/+62
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	some changes introduced by 4daa6da5407d235cbe4f7a787eaa29304446a870, 26b6e299e1c97b956306572c5c9f6c02f428bfd7, 17898ce021fc365c620d4600df68c3e7d2151619 were regressed during today's merge conflict resolution of !11573. This commit serves to reapply those changes. /cc: @rspeicher @stanhu @mikegreiling
* \| \| \| \| \| \| \|	Merge branch '30392_support_for_multiple_key_value_stores' into 'master'	Robert Speicher	2017-07-11	118	-450/+1158
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support multiple Redis instances based on queue type See merge request !11573
\| * \| \| \| \| \| \|	Support multiple Redis instances based on queue type	Paul Charlton	2017-07-11	118	-450/+1158
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'catch-redis-address-error' into 'master'	Stan Hu	2017-07-10	2	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Catch redis address error Closes omnibus-gitlab#2545 See merge request !12542
\| * \| \| \| \| \|	Merge branch 'master' into 'catch-redis-address-error'	DJ Mountney	2017-07-10	1685	-12592/+31320
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # lib/gitlab/current_settings.rb
* \| \| \| \| \| \|	Merge branch 'fix_milestone_destroy_service' into 'master'	Mike Greiling	2017-07-10	2	-2/+55
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestones destroy service See merge request !12762
\| * \| \| \| \| \| \|	Fix milestones destroy servicefix_milestone_destroy_service	Felipe Artur	2017-07-10	2	-2/+55
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'document-gitlab-shell-disable-gems' into 'master'	Stan Hu	2017-07-10	1	-0/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc:installation add note about disable-gems for gitlab-shell See merge request !12765
\| * \| \| \| \| \|	doc:installation add note about disable-gems for gitlab-shell	Jason Plum	2017-07-10	1	-0/+6
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1707#note_34351820 Adding notation about speeding up `gitlab-shell` by disabling RubyGems
* \| \| \| \| \|	Merge branch 'revert_bootsnap' into 'master'	Robert Speicher	2017-07-10	4	-15/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'" See merge request !12755
\| * \| \| \| \| \|	Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'"	Marin Jankovski	2017-07-10	4	-15/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 83ec509ce43c56da601335de5b9ea4422c785560, reversing changes made to 57f0677ad854b7b17bd57e1e3b0ef542ce322b56.
* \| \| \| \| \|	Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'	Sean McGivern	2017-07-10	7	-41/+145
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove remaining N+1 queries in merge requests API with emojis and labels Closes #34159 See merge request !12732
\| * \| \| \| \| \|	Add spec for IssuableMetadata modulesh-optimize-mr-api-emojis-and-labels	Stan Hu	2017-07-08	1	-0/+59
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add spec for N+1 queries	Stan Hu	2017-07-08	1	-0/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove remaining N+1 queries in merge requests API with emojis and labels	Stan Hu	2017-07-08	6	-41/+74
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #34159
* \| \| \| \| \|	Merge branch '34728-fix-application-setting-created-when-redis-down' into ↵	Stan Hu	2017-07-10	5	-8/+35
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Prevent bad data being added to application settings when Redis is unavailable Closes #34728 See merge request !12750
\| * \| \| \| \|	Prevent bad data being added to application settings when Redis is unavailable	Nick Thomas	2017-07-10	5	-8/+35
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '34891-follow-up-feature-group' into 'master'	Sean McGivern	2017-07-10	2	-0/+8
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-add Feature.register_feature_groups which is already documented Closes #34891 See merge request !12751
\| * \| \| \| \|	Re-add Feature.register_feature_groups which is already documented	Rémy Coutable	2017-07-10	2	-0/+8
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a follow-up for !12362 where this was documented but the code was removed in the last iteration. Since this can still be useful and this is already supported by the API, I think re-adding the code was the best course of action. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'fix/gb/qa/configure-headless-chrome-screenshots' into 'master'	Rémy Coutable	2017-07-10	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Configure headless chrome screenshots correctly See merge request !12746
\| * \| \| \| \|	Configure headless chrome screenshots correctlyfix/gb/qa/configure-headless-chrome-screenshots	Grzegorz Bizon	2017-07-10	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'backstage/gb/qa/increase-qa-screenshots-size' into 'master'	Rémy Coutable	2017-07-10	1	-13/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase GitLab QA screenshots size See merge request !12748
\| * \| \| \| \| \|	Increase GitLab QA screenshots size	Grzegorz Bizon	2017-07-10	1	-13/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'backport-exceptions-argument' into 'master'	Rémy Coutable	2017-07-10	1	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow passing exceptions when creating project services See merge request !12745
\| * \| \| \| \| \|	Allow passing exceptions when creating project servicesbackport-exceptions-argument	Sean McGivern	2017-07-10	1	-2/+4
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix/gb/qa/fix-test-scenario-for-adding-a-project' into 'master'	Rémy Coutable	2017-07-10	4	-19/+8
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix QA test scenario for creating a new project Closes gitlab-qa#56 See merge request !12747
\| * \| \| \| \|	Fix QA test scenario for creating a new project	Grzegorz Bizon	2017-07-10	4	-19/+8
\|/ / / / /
* \| \| \| \|	Merge branch 'fix/offline_runner_detection' into 'master'	Rémy Coutable	2017-07-10	2	-3/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix offline runner detection See merge request !11751
\| * \| \| \| \|	Fix offline runner detection	Alessio Caiazza	2017-07-07	2	-3/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs/exclude-gitlab-git-test' into 'master'	Rémy Coutable	2017-07-10	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Exclude gitlab_git_test from docs only changes See merge request !12703
\| * \| \| \| \| \|	Exclude gitlab_git_test from docs only changesdocs/exclude-gitlab-git-test	Achilleas Pipinellis	2017-07-07	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-24' into 'master'	Rémy Coutable	2017-07-10	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab-ee reference in ee_compat_check See merge request !12713
\| * \| \| \| \| \| \|	Fix gitlab-ee reference in ee_compat_check	Pedro Moreira da Silva	2017-07-07	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '34810-vue-pagination' into 'master'	Phil Hughes	2017-07-10	4	-137/+188
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent default click since we change the url manually Closes #34810 See merge request !12721
\| * \| \| \| \| \| \|	Update tests to test what the component renders and what the clicks calls34810-vue-pagination	Filipa Lacerda	2017-07-07	3	-161/+179
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use vue .prevent to prevent the click	Filipa Lacerda	2017-07-07	1	-3/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Prevent default click since we change the url manually	Filipa Lacerda	2017-07-07	3	-6/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds tests
* \| \| \| \| \| \| \|	Merge branch 'rs-sign_in' into 'master'	Douwe Maan	2017-07-09	280	-413/+398
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change gitlab_sign_in to sign_in See merge request !12369
\| * \| \| \| \| \| \| \|	Change `sign_out` usage to `gitlab_sign_out` in one spec	Robert Speicher	2017-07-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For reasons that are still unclear, the EE version (but only the EE version) of this spec was failing reliably, and changing these calls seemed to resolve it. So we're making the change here for parity.
\| * \| \| \| \| \| \| \|	Merge branch 'master' into rs-sign_in	Robert Speicher	2017-07-07	111	-294/+2132
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into rs-sign_in	Robert Speicher	2017-07-07	266	-1119/+3642
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into rs-sign_in	Robert Speicher	2017-07-06	906	-5137/+11025
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Auto-correct ProjectPathHelper violations	Robert Speicher	2017-07-06	224	-893/+810
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add ProjectPathHelper cop	Douwe Maan	2017-07-06	3	-0/+93
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove instance variable assignment from `gitlab_sign_in` helperrs-sign_in	Robert Speicher	2017-06-29	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also removes `Thread.current[:current_user]` assignment from `gitlab_sign_in_via`