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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix click not being able to find the current element to use trigger('click') ↵34302-update-test	Filipa Lacerda	2017-06-26	1	-1/+1
\| \| \| \|	instead
*	Merge branch 'fix/gb/fix-skipped-pipeline-with-allowed-to-fail-jobs' into ↵	Kamil Trzciński	2017-06-26	5	-11/+57
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix pipeline status when allowed to fail jobs present Closes #29059 See merge request !11166
\| *	Check warnings when building compound status SQL query	Grzegorz Bizon	2017-06-20	3	-17/+14
\| \|
\| *	Fix specs for a concern that implements CI/CD statuses	Grzegorz Bizon	2017-06-20	1	-1/+1
\| \|
\| *	Add test for using overridden status method with scopes	Grzegorz Bizon	2017-06-20	1	-0/+11
\| \|
\| *	Add changelog entry for pipeline status fix	Grzegorz Bizon	2017-06-20	1	-0/+4
\| \|
\| *	Move custom compound status method to commit status	Grzegorz Bizon	2017-06-20	3	-3/+31
\| \|
\| *	Fix pipeline status when allowed to fail jobs present	Grzegorz Bizon	2017-06-20	2	-1/+7
\| \|
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2017-06-26	222	-2451/+5186
\|\ \
\| * \	Merge branch 'issue-inline-edit-quick-submit' into 'master'	Filipa Lacerda	2017-06-26	6	-2/+58
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes ctrl+enter not submit issue edit form Closes #33758 See merge request !12422
\| \| * \|	Fixes ctrl+enter not submit issue edit formissue-inline-edit-quick-submit	Phil Hughes	2017-06-24	6	-2/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33758
\| * \| \|	Merge branch 'grpc-1.4' into 'master'	Sean McGivern	2017-06-26	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use grpc 1.4.0 Closes omnibus-gitlab#2414 See merge request !12387
\| \| * \| \|	Use grpc 1.4.0	Jacob Vosmaer	2017-06-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'zj-faster-charts-page' into 'master'	Grzegorz Bizon	2017-06-26	9	-33/+35
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance for pipeline charts Closes #32407 See merge request !12378
\| \| * \| \| \|	Remove last references to job for pipeline chartszj-faster-charts-page	Z.J. van de Weg	2017-06-26	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is not ammended to another commit as it will probably have failing tests which I'll fix and amend to this commit.
\| \| * \| \| \|	Remove references to build in pipeline charts	Z.J. van de Weg	2017-06-23	7	-17/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Being the good boyscouts, but mainly because of [the comment in the review](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12378#note_33302115) the words used for classes and variables are changed to not use builds anymore.
\| \| * \| \| \|	Improve performance for pipeline charts	Z.J. van de Weg	2017-06-23	5	-19/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Achieved by using another table, which both has better indexes and is smaller. Now the data provided for the user is more valueable too.
\| * \| \| \| \|	Merge branch 'dm-group-page-name' into 'master'	Sean McGivern	2017-06-26	4	-6/+10
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show group name instead of path on group page See merge request !12391
\| \| * \| \| \| \|	Show group name instead of path on group pagedm-group-page-name	Douwe Maan	2017-06-23	4	-6/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix-34019' into 'master'	Sean McGivern	2017-06-26	2	-1/+20
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Perform project housekeeping after importing projects Closes #34019 See merge request !12323
\| \| * \| \| \| \| \|	Check if repository exists before performing housekeepingfix-34019	Douglas Barbosa Alexandre	2017-06-23	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Break Project#perform_housekeeping in two methods	Douglas Barbosa Alexandre	2017-06-23	1	-4/+12
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add CHANGELOG	Douglas Barbosa Alexandre	2017-06-23	1	-0/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Perform project housekeeping after importing projects	Douglas Barbosa Alexandre	2017-06-23	1	-3/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '33223-multiple-tooltips-on-the-same-vue-component' into 'master'	Phil Hughes	2017-06-26	30	-123/+251
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for multiple tooltips in the same Vue component Closes #33223 See merge request !11954
\| \| * \| \| \| \| \| \|	Add support for multiple tooltips in the same Vue component	Eric Eastwood	2017-06-23	30	-123/+251
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33223
\| * \| \| \| \| \| \| \|	Merge branch ↵	Marcia Ramos	2017-06-24	2	-4/+4
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34264-replace-settings-ci-cd-pipelines-with-settings-pipelines-in-docs' into 'master' Resolve "Replace 'Settings ➔ CI/CD Pipelines' with 'Settings ➔ Pipelines' in docs" Closes #34264 See merge request !12433
\| \| * \| \| \| \| \| \| \|	Replace 'Settings ➔ CI/CD Pipelines' with 'Settings ➔ Pipelines' in docs34264-replace-settings-ci-cd-pipelines-with-settings-pipelines-in-docs	bikebilly	2017-06-23	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix-profile-show-interpolation' into 'master'	Phil Hughes	2017-06-24	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix interpolation in app/views/profile/show.html/haml See merge request !12439
\| \| * \| \| \| \| \| \| \| \|	Fix interpolation in app/views/profile/show.html/haml	Nick Thomas	2017-06-24	1	-1/+1
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	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