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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Enable Style/DotPosition	Douwe Maan	2017-02-23	188	-871/+868
\|
*	Update .rubocop_todo.yml	Douwe Maan	2017-02-23	1	-128/+445
\|
*	Merge branch 'cs-upgrade-licensee' into 'master' 27950-check-ci-status	Rémy Coutable	2017-02-23	6	-18/+18
\|\ \| \| \| \| \| \| \| \|	Update Licensee from 8.0.0 to 8.7.0. See merge request !9451
\| *	Update Licensee from 8.0.0 to 8.7.0.cs-upgrade-licensee	Connor Shea	2017-02-22	6	-18/+18
\| \| \| \| \| \| \| \|	Changelog: https://github.com/benbalter/licensee/releases
* \|	Merge branch '26900-pipelines-tabs' into 'master'	Kamil Trzciński	2017-02-23	8	-25/+102
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "CI - Pipelines and Builds screens are inconsistent" Closes #26900 See merge request !9265
\| * \|	Adds missing tests for all status accepted in scope	Filipa Lacerda	2017-02-23	2	-16/+28
\| \| \|
\| * \|	Merge branch 'master' into 26900-pipelines-tabs26900-pipelines-tabs	Filipa Lacerda	2017-02-23	856	-4741/+10013
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (361 commits) Code style improvements remove require.context from network_bundle remove require.context from graphs_bundle remove require.context from filtered_search_bundle Ignore two Rails CVEs in bundler:audit job Remove Pages readme Change Pages redirect Add missing index.md to Pages docs Added double newline after file upload markdown insert Reorder main index items in Pages overview remove html comments remove <> wrapping text - part 3 wrapping text - part 2 [ci skip] fix link wrap text - part 1 - [ci skip] typo fix spelling, add intermediate cert link Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag remove link to unfinished video ...
\| * \| \|	Adds Pending and Finished tabs to pipelines page	Filipa Lacerda	2017-02-16	8	-12/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken test
* \| \| \|	Merge branch 'api-remove-merge-request-endpoint' into 'master'	Sean McGivern	2017-02-23	1	-1/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove last merge_request endpoint See merge request !9470
\| * \| \| \|	Remove last merge_request endpoint	Robert Schilling	2017-02-23	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-test-for-build-attributes' into 'master'	Kamil Trzciński	2017-02-23	2	-5/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build attributes test See merge request !9409
\| * \| \| \| \|	We actually want to clone project and remove gl_project_idfix-test-for-build-attributes	Lin Jen-Shin	2017-02-21	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in the future. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9409#note_23859361
\| * \| \| \| \|	Fix build attributes test, see:	Lin Jen-Shin	2017-02-21	2	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9021#note_23782188 This is discovered by https://gitlab.com/gitlab-org/gitlab-ce/builds/10815456 I removed `gl_project_id` and this is failing. I took some look, realizing that: * `trace` is duplicated in `attributes` * `tag_list` is not included in `build.attributes` * `artifacts_expire_at` is missing in `attributes` So we need to: * Remove duplicated `trace` in `attributes` (40 -> 39) * Remove `tag_list` in `attributes` (39 -> 38) * Add `artifacts_expire_at` to `attributes` (38 -> 39) * Add `gl_project_id` to `attributes` (39 -> 40)
* \| \| \| \| \|	Merge branch '26570-optimize-latest-pipeline-query' into 'master'	Kamil Trzciński	2017-02-23	4	-4/+25
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize Ci::Pipeline.latest query Closes #26570 See merge request !9306
\| * \| \| \| \|	Add index for ci_commits for gl_project_id, ref, status26570-optimize-latest-pipeline-query	Lin Jen-Shin	2017-02-20	3	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and remove the old one which we don't really need.
\| * \| \| \| \|	Consider the case where we don't specify ref for pipeline	Lin Jen-Shin	2017-02-20	1	-3/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Optimize Ci::Pipeline.latest query	Lin Jen-Shin	2017-02-20	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we already know which ref we want, we could filter it out first. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/issues/26570#note_23423376 Closes #26570
* \| \| \| \| \|	Merge branch 'api-notes-entity-fields' into 'master'	Sean McGivern	2017-02-23	13	-24/+723
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated `upvotes` and `downvotes` from the notes API Closes #28441 See merge request !9384
\| * \ \ \ \ \	Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fields	Robert Schilling	2017-02-22	222	-1125/+898
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/api/v3_to_v4.md
\| * \| \| \| \| \| \|	Remove deprecated `upvotes` and `downvotes` from the notes API	Robert Schilling	2017-02-22	13	-25/+723
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '26875-builds-api-endpoint-skipped-scope' into 'master'	Rémy Coutable	2017-02-23	3	-1/+19
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add all available statuses to scope filter for project builds endpoint Closes #26875 See merge request !8971
\| * \| \| \| \| \| \|	Rebase to master for avoiding failing tests	George Andrinopoulos	2017-02-23	3	-1/+19
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '28495-content-shifting' into 'master'	Filipa Lacerda	2017-02-23	1	-10/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep right padding the same whether sidebar is open or not Closes #28495 See merge request !9422
\| * \| \| \| \| \| \|	Keep right padding the same whether sidebar is open or not28495-content-shifting	Annabel Dunstone Gray	2017-02-21	1	-10/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '26348-cleanup-navigation-order-groups' into 'master'	Alfredo Sumaran	2017-02-23	11	-22/+52
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleaning up our navigational order - Groups See merge request !9309
\| * \| \| \| \| \| \| \|	Code style improvements	Alfredo Sumaran	2017-02-23	11	-22/+52
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'remove-require-context-filtered-search-bundle' into 'master'	Alfredo Sumaran	2017-02-23	1	-3/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from filtered_search_bundle See merge request !9460
\| * \| \| \| \| \| \| \|	remove require.context from filtered_search_bundleremove-require-context-filtered-search-bundle	Mike Greiling	2017-02-22	1	-3/+9
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove-require-context-graphs-bundle' into 'master'	Alfredo Sumaran	2017-02-23	1	-3/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from graphs_bundle See merge request !9459
\| * \| \| \| \| \| \| \| \|	remove require.context from graphs_bundleremove-require-context-graphs-bundle	Mike Greiling	2017-02-22	1	-3/+4
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'remove-require-context-network-bundle' into 'master'	Alfredo Sumaran	2017-02-23	1	-3/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove require.context from network_bundle See merge request !9458
\| * \| \| \| \| \| \| \| \|	remove require.context from network_bundleremove-require-context-network-bundle	Mike Greiling	2017-02-22	1	-3/+2
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'update-ci-skip-regex-to-accept-underscores-and-hyphens' into ↵	Robert Speicher	2017-02-22	2	-43/+31
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' updated ci skip regex to accept underscores and hyphens See merge request !9130
\| * \| \| \| \| \| \| \|	updated ci skip regex to accept underscores and hyphensupdate-ci-skip-regex-to-accept-underscores-and-hyphens	Luke "Jared" Bennett	2017-02-22	2	-43/+31
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into ↵	Robert Speicher	2017-02-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag See merge request !9447
\| * \| \| \| \| \| \| \| \|	Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flag	Rémy Coutable	2017-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should solve 99% of the false-positive of the `ee_compat_check` job.
* \| \| \| \| \| \| \| \| \|	Merge branch 'ignore-rails-cves' into 'master'	Robert Speicher	2017-02-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore two Rails CVEs in bundler:audit job See merge request !9456
\| * \| \| \| \| \| \| \| \| \|	Ignore two Rails CVEs in bundler:audit job	Douwe Maan	2017-02-22	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '22466-task-list-alignment' into 'master'	Annabel Dunstone Gray	2017-02-22	4	-11/+35
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align Task List Checkboxes Closes #22466 See merge request !6487
\| * \| \| \| \| \| \| \| \| \|	Position task list checkbox to match the list indent	Jared Deckard	2017-02-10	4	-11/+35
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'add-issues-tooltip' into 'master'	Alfredo Sumaran	2017-02-22	4	-5/+51
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tooltip to add issues button on issue boards Closes #27985 See merge request !9142
\| * \| \| \| \| \| \| \| \| \| \|	Added testsadd-issues-tooltip	Phil Hughes	2017-02-21	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Added CHANGELOG	Phil Hughes	2017-02-21	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Added tooltip to add issues button on issue boards	Phil Hughes	2017-02-21	1	-3/+39
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #27985
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'newline-after-file-attachment-notes' into 'master'	Alfredo Sumaran	2017-02-22	2	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added double newline after file upload markdown insert Closes #28511 See merge request !9430
\| * \| \| \| \| \| \| \| \| \| \|	Added double newline after file upload markdown insert	Luke "Jared" Bennett	2017-02-22	2	-2/+12
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/pages-redirect' into 'master'	Achilleas Pipinellis	2017-02-22	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Pages readme See merge request !9454
\| * \| \| \| \| \| \| \| \| \| \|	Remove Pages readme	Achilleas Pipinellis	2017-02-22	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To prevent a redirect loop in docs.gitlab.com/ce/pages/ [ci skip]
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/pages-redirect' into 'master'	Achilleas Pipinellis	2017-02-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| / \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \|	Change Pages redirect See merge request !9452
\| * \| \| \| \| \| \| \| \| \|	Change Pages redirect	Achilleas Pipinellis	2017-02-22	1	-1/+1
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]