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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed DestroyService spec to actually test if removal was successfulbackport-destroy-service-spec-fixes	Gabriel Mazetto	2017-06-24	1	-2/+3
\|
*	Monty's version is better.	sytses	2017-06-23	1	-1/+1
\|
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	sytses	2017-06-23	196	-2504/+5238
\|\
\| *	Merge branch 'dm-requirements-txt-tilde' into 'master'	Grzegorz Bizon	2017-06-23	3	-1/+10
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't match tilde and exclamation mark as part of requirements.txt package name Closes #34166 See merge request !12431
\| \| *	Don't match tilde and exclamation mark as part of requirements.txt package namedm-requirements-txt-tilde	Douwe Maan	2017-06-23	3	-1/+10
\| \| \|
\| * \|	Merge branch 'tc-refactor-projects-finder-init-collection' into 'master'	Douwe Maan	2017-06-23	7	-6/+30
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add User#full_private_access? to check if user has access to all private groups & projects Closes #31745 See merge request !12373
\| \| * \|	Add User#full_private_access? to check if user has Private accesstc-refactor-projects-finder-init-collection	Toon Claes	2017-06-23	7	-6/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In CE only the admin has access to all private groups & projects. In EE also an auditor can have full private access. To overcome merge conflicts, or accidental incorrect access rights, abstract this out in `User#full_private_access?`. `User#admin?` now only should be used for admin-only features. For private access-related features `User#full_private_access?` should be used. Backported from gitlab-org/gitlab-ee!2199
\| * \| \|	Merge branch 'mk-fix-breadcrumb-order-33938' into 'master'	Douwe Maan	2017-06-23	3	-1/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix breadcrumb order Closes #33938 See merge request !12322
\| \| * \| \|	Add changelog entrymk-fix-breadcrumb-order-33938	Michael Kozono	2017-06-23	1	-0/+4
\| \| \| \| \|
\| \| * \| \|	Fix breadcrumb order	Michael Kozono	2017-06-22	2	-1/+14
\| \| \| \| \|
\| * \| \| \|	Merge branch 'mk-fix-issue-34068' into 'master'	Douwe Maan	2017-06-23	2	-2/+6
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 on failure to create a private group Closes #34068 See merge request !12394
\| \| * \| \| \|	Fix 500 on create group failures	Michael Kozono	2017-06-23	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #34068
\| * \| \| \| \|	Merge branch 'fix/gb/improve-updating-column-in-batches-helper' into 'master'	Yorick Peterse	2017-06-23	19	-30/+77
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve `update_column_in_batches` migration helper Closes #34064 See merge request !12350
\| \| * \| \| \| \|	Fix Rubocop offense in migration helpers specsfix/gb/improve-updating-column-in-batches-helper	Grzegorz Bizon	2017-06-22	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'master' into fix/gb/improve-updating-column-in-batches-helper	Grzegorz Bizon	2017-06-22	439	-3577/+4596
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (56 commits) File view buttons Don't reset the session when the example failed, because we need capybara-screenshot to have access to it Resolve "MR comment + system note highlight don't have the same width" Add feature spec for dashboard state filter tabs Wording of Mysql support. a new feature checklist and more elaborate documentation requirements Filter archived project in API v3 only if param present Revert to using links instead of buttons in Issuable Index tabs. Do not run the codeclimate job on docs-only changes Only show gray footer space if environment actions exist Migrate Gitlab::Git::Blob.find to Gitaly Backport filtered search lazy token consistent state fix Add a comment explaining how the branch clean up happens Fix Github::Representation::PullRequest#source_branch_exists? Add CHANGELOG Fix GitHub importer performance on branch existence check Rebuild the dynamic path before validating it Rename stage ref migration specs to match a class name Enable Style/DotPosition Rubocop :cop: Revert "Merge branch 'winh-merge-request-related-issues' into 'master'" ... Conflicts: db/post_migrate/20170526185921_migrate_build_stage_reference.rb
\| \| * \| \| \| \| \|	Disable transaction in specs for some migrations	Grzegorz Bizon	2017-06-22	2	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix specs for database migration helpers with transactions	Grzegorz Bizon	2017-06-22	1	-2/+8
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix migration specs that can not run within transaction	Grzegorz Bizon	2017-06-21	6	-5/+7
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Disable transactions in migrations that should not use it	Grzegorz Bizon	2017-06-21	10	-0/+21
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Raise if updating columns in batches within a transaction	Grzegorz Bizon	2017-06-21	2	-21/+41
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '34219-extra-symbol-notifications-modal' into 'master'	Phil Hughes	2017-06-23	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra symbol in notifications modal Closes #34219 See merge request !12417
\| \| * \| \| \| \| \| \|	Remove extra symbol in notifications modal34219-extra-symbol-notifications-modal	Annabel Dunstone Gray	2017-06-23	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'commit-comments-limited-width' into 'master'	Annabel Dunstone Gray	2017-06-23	7	-12/+23
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit the width of commit & snippet comment sections Closes #20920 See merge request !12088
\| \| * \| \| \| \| \| \| \|	Limit the width of commit & snippet comment sections	Phil Hughes	2017-06-23	7	-12/+23
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'project-readme-limited-width' into 'master'	Annabel Dunstone Gray	2017-06-23	5	-2/+13
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit the width of project READMEs Closes #20919 See merge request !12165
\| \| * \| \| \| \| \| \| \|	Limit the width of project READMEs	Phil Hughes	2017-06-23	5	-2/+13
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch ↵	Grzegorz Bizon	2017-06-23	3	-5/+13
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta' into 'master' Update QA Dockerfile to use stable Chrome package Closes #33538 See merge request !12071
\| \| * \| \| \| \| \| \| \|	Update chrome version and the binary path33538-update-ci-dockerfile-now-that-chrome-headless-no-longer-in-beta	Grzegorz Bizon	2017-06-22	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	add CHANGELOG.md entry for !12071	Mike Greiling	2017-06-21	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	rename DRIVER_VERSION environment variable to CHROME_DRIVER_VERSION	Mike Greiling	2017-06-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	update chrome version and chromedriver	Mike Greiling	2017-06-21	1	-4/+8
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Update Dockerfile to utilize the stable release of Google Chrome 59	Mike Greiling	2017-06-21	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'winh-promise-rejects-fail-tests' into 'master'	Phil Hughes	2017-06-23	8	-160/+257
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make JavaScript tests fail for unhandled Promise rejections Closes #33845 and #33623 See merge request !12264
\| \| * \| \| \| \| \| \| \| \|	Make JavaScript tests fail for unhandled Promise rejections	Winnie Hellmann	2017-06-23	8	-160/+257
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'hot-reload' into 'master'	Tim Zallmann	2017-06-23	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hot reloading for .vue files Closes #33729 See merge request !12180
\| \| * \| \| \| \| \| \| \| \|	hot reloading for .vue fileshot-reload	Simon Knox	2017-06-15	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch '31574-bootstrap-form-builder' into 'master'	Phil Hughes	2017-06-23	5	-74/+53
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bootstrap_form gem See merge request !10985
\| \| * \| \| \| \| \| \| \| \| \|	Convert app/views/profiles/show.html.haml to bootstrap_form	Nick Thomas	2017-06-22	3	-74/+50
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add bootstrap_form gem	Nick Thomas	2017-06-22	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch '33992-mr-target-avatar' into 'master'	Phil Hughes	2017-06-23	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add padding to target branch container Closes #33992 See merge request !12353
\| \| * \| \| \| \| \| \| \| \| \| \|	Add padding to target branch container33992-mr-target-avatar	Annabel Dunstone Gray	2017-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-sidebar-scroll-jump' into 'master'	Phil Hughes	2017-06-23	1	-3/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove layout nav from scroll calculation Closes #33984 See merge request !12399
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Remove layout nav from scroll calculationfix-sidebar-scroll-jump	Annabel Dunstone Gray	2017-06-22	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '34095-permalinks' into 'master'	Phil Hughes	2017-06-23	2	-3/+14
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix offset for fixed nav Closes #34095 See merge request !12365
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix offset for fixed nav	Annabel Dunstone Gray	2017-06-23	2	-3/+14
\| \|/ / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'notes-es-class-syntax' into 'master'	Tim Zallmann	2017-06-23	1	-1374/+1356
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Notes into ES class syntax See merge request !12254
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	refactor Notes class to ES class syntaxnotes-es-class-syntax	Mike Greiling	2017-06-22	1	-1374/+1356
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-unnecessary-top-padding' into 'master'	Sean McGivern	2017-06-23	2	-2/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary top padding on group MR index See merge request !12392
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary top padding on group MR indexdm-unnecessary-top-padding	Douwe Maan	2017-06-22	2	-2/+5
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '34120-environment-detail-bug' into 'master'	Phil Hughes	2017-06-23	3	-9/+11
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix mobile environment detail view Closes #34120 See merge request !12382