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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Create guest users only when necessary rather than for every specrs-overcreating-users	Robert Speicher	2017-07-21	2	-12/+24
\| \| \| \| \| \|	These are two examples of a top-level `before` block doing too much. Only specific specs cared about these guest users, but we were creating them and their `ProjectMember` records for every single spec that ran.
*	Merge branch 'dz-sidekiq-remove-queue' into 'master'	Sean McGivern	2017-07-21	1	-0/+7
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update sidekiq style guide with rename/remove queue instructions Closes #34223 See merge request !13009
\| *	Capitalize Sidekiq word in dev doc	Dmitriy Zaporozhets	2017-07-21	1	-1/+1
\| \|
\| *	Update sidekiq_style_guide.md with removing or renaming queues instructionsdz-sidekiq-remove-queue	Dmitriy Zaporozhets	2017-07-21	1	-0/+7
\| \|
* \|	Merge branch 'harishsr-fix-typo-in-ldap-docs' into 'master'	Drew Blessing	2017-07-21	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in the LDAP docs missing a required colon See merge request !12973
\| * \|	Fix typo in the LDAP docs missing a required colon	Harish Ramachandran	2017-07-19	1	-1/+1
\| \| \|
* \| \|	Merge branch '35236-svg-logo' into 'master'	Phil Hughes	2017-07-21	3	-4/+17
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use custom font SVG for logo Closes #35236 See merge request !13018
\| * \| \|	Use custom font SVG for logo	Annabel Dunstone Gray	2017-07-21	3	-4/+17
\| \| \| \|
* \| \| \|	Merge branch '35367-speedup-lint-javascript-report-job' into 'master'	Kamil Trzciński	2017-07-21	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the `lint:javascript:report` job depends on `setup-test-env` only Closes #35367 See merge request !12998
\| * \| \| \|	Make the lint:javascript:report job depends on setup-test-env only35367-speedup-lint-javascript-report-job	Rémy Coutable	2017-07-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'breadcrumbs-px-height' into 'master'	Phil Hughes	2017-07-21	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 1px to breadcrumbs min height See merge request !13020
\| * \| \| \| \|	Add 1px to breadcrumbs min height	Annabel Dunstone Gray	2017-07-21	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-tree-entries' into 'master'	Rémy Coutable	2017-07-21	5	-33/+108
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate CommitService.GetTreeEntries Gitaly call Closes gitaly#372 See merge request !12941
\| * \| \| \| \| \|	Incorporate CommitService.GetTreeEntries Gitaly callgitaly-tree-entries	Alejandro Rodríguez	2017-07-20	5	-33/+108
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '34549-extract-devise-mappings-into-helper' into 'master'	Rémy Coutable	2017-07-21	6	-6/+32
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test helper Closes #34549 See merge request !12742
\| * \| \| \| \| \|	Extract "@request.env['devise.mapping'] = Devise.mappings[:user]" to a test ↵	Jacopo	2017-07-20	6	-6/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	helper Extracted `@request.env['devise.mapping'] = Devise.mappings[:user]` and `Rails.application.env_config['devise.mapping'] = Devise.mappings[:user]` in our tests into the helper method `set_devise_mapping`
* \| \| \| \| \| \|	Merge branch 'rs-move-mr-slash-command-spec-from-issues' into 'master'	Rémy Coutable	2017-07-21	2	-26/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move a spec related to merge requests out of a feature related to issues See merge request !13002
\| * \| \| \| \| \| \|	Move a spec related to merge requests out of a feature related to issuesrs-move-mr-slash-command-spec-from-issues	Robert Speicher	2017-07-20	2	-26/+18
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'feature/migrate-commit-find-all-to-gitaly' into 'master'	Robert Speicher	2017-07-21	6	-64/+130
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Commit.find_all to Gitaly Closes gitaly#396 See merge request !12934
\| * \| \| \| \| \| \|	Migrate Gitlab::Git::Commit.find_all to Gitalyfeature/migrate-commit-find-all-to-gitaly	Ahmad Sherif	2017-07-20	6	-64/+130
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#396
* \| \| \| \| \| \| \|	Merge branch 'improve-ee-compat-check' into 'master'	Robert Speicher	2017-07-21	1	-6/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Developer can just download the patch from the `ee_compat_check` job's artifact See merge request !12967
\| * \| \| \| \| \| \| \|	Developer can just download the patch from the `ee_compat_check` job's artifactimprove-ee-compat-check	Rémy Coutable	2017-07-19	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch '28975-recommend-using-v4-api-on-slash-command-integrations' ↵	Robert Speicher	2017-07-21	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Recommend V4 API usage on chat slash command integrations Closes #28975 See merge request !12954
\| * \| \| \| \| \| \| \| \|	Recommend using V4 API on chat slash command integrations28975-recommend-using-v4-api-on-slash-command-integrations	Oswaldo Ferreira	2017-07-19	3	-3/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2017-07-21	2	-20/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specified' into 'master' Improve version handling on component install tasks Closes #34788 See merge request !13006
\| * \| \| \| \| \| \| \| \| \|	Improve version handling on component install tasks34788-testenv-doesn-t-update-the-component-correctly-when-a-branch-is-specified	Alejandro Rodríguez	2017-07-20	2	-20/+4
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes an issue where, when using branch versions, the component wouldn't be updated after the first branch checkout. We also save one step, since checking out the FETCH_HEAD with `-f` already does what `reset --hard` did.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'	Sean McGivern	2017-07-21	3	-8/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix an infinite loop in Gitlab:UntrustedRegexp See merge request !2146
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/qa/fix-new-project-selectors' into 'master'	Rémy Coutable	2017-07-21	5	-12/+25
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix new project selectors in GitLab QA Closes gitlab-qa#57 See merge request !13012
\| * \| \| \| \| \| \| \| \| \|	Fix new project selectors in GitLab QAfix/gb/qa/fix-new-project-selectors	Grzegorz Bizon	2017-07-21	5	-12/+25
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/gb/update-background-migrations-development-docs' into ↵	Sean McGivern	2017-07-21	1	-0/+36
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Extend background migration development guidelines See merge request !12988
\| * \| \| \| \| \| \| \| \| \| \|	Copy-edit background migrations guidelines	Grzegorz Bizon	2017-07-21	1	-7/+13
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Extend background migration development guidelines	Grzegorz Bizon	2017-07-20	1	-0/+30
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dz-update-grape' into 'master'	Sean McGivern	2017-07-21	23	-9/+35
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update grape gem See merge request !12992
\| * \| \| \| \| \| \| \| \| \| \|	Update grape gemdz-update-grape	Dmitriy Zaporozhets	2017-07-20	23	-9/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New version of the gem returns 200 status code on delete with content instead of 204 so we explicitly set status code to keep existing behavior Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-07-21	1	-7/+26
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34995_add_traditional_chinese_in_taiwan_translations_of_pipeline_schedules' into 'master' Add Traditional Chinese in Taiwan translations of Pipeline Schedules Closes #34995 See merge request !12982
\| * \| \| \| \| \| \| \| \| \| \| \|	Add Traditional Chinese in Taiwan translations of Pipeline Schedules	Huang Tao	2017-07-21	1	-7/+26
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '31031-convert-protected-branches-es6' into 'master'	Filipa Lacerda	2017-07-21	15	-194/+195
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert Protected Branches feature JS code to ES6 See merge request !12970
\| * \| \| \| \| \| \| \| \| \| \| \|	Spread used props31031-convert-protected-branches-es6	kushalpandya	2017-07-20	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Move module initialization to bundle root	kushalpandya	2017-07-20	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Initialize module on bundle load	kushalpandya	2017-07-20	2	-4/+18
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary `scrollTo`	kushalpandya	2017-07-20	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Use JS class for selector	kushalpandya	2017-07-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Update Protected Branches feature initialization	kushalpandya	2017-07-19	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Update Protected Branches bundle path	kushalpandya	2017-07-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add styles to branches list container	kushalpandya	2017-07-19	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add class to use in JS and tests	kushalpandya	2017-07-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add class to use in JS and test, add flash error container	kushalpandya	2017-07-19	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Export only used classes	kushalpandya	2017-07-19	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix lint errors, add constructor info	kushalpandya	2017-07-19	1	-17/+22
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Convert to ES6 class	kushalpandya	2017-07-19	4	-156/+146
\| \| \| \| \| \| \| \| \| \| \| \| \|