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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'	Sean McGivern	2018-06-11	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Uploads specs are failing on master" Closes #47684 See merge request gitlab-org/gitlab-ce!19638
\| *	Don't use Rails.root.join for upload fixture paths	Rémy Coutable	2018-06-11	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Avoid checking the user format in every url validation	Francisco Javier López	2018-06-11	2	-2/+16
\|/
*	Don't use Gitlab::Utils.nlbr in Gitlab::Git	Jacob Vosmaer (GitLab)	2018-06-11	1	-5/+5
\|
*	Merge branch 'rs-update-rspec' into 'master'	Rémy Coutable	2018-06-11	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449
\| *	Make all uses of `fixture_file_upload` use relative paths	Robert Speicher	2018-06-07	1	-2/+2
\| \|
* \|	Merge branch 'issue_44230' into 'master'	Sean McGivern	2018-06-07	2	-0/+68
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Apply notification settings level of groups to all child objects Closes #44230 See merge request gitlab-org/gitlab-ce!19191
\| * \|	Apply notification settings level of groups to all child objects	Felipe Artur	2018-06-07	2	-0/+68
\| \| \|
* \| \|	Merge remote-tracking branch 'origin/master' into ↵	Kamil Trzciński	2018-06-07	5	-4/+139
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	38542-application-control-panel-in-settings-page
\| * \| \|	Resolve "Automatically provide a Deploy Token to projects when Auto DevOps ↵	Mayra Cabrera	2018-06-07	1	-0/+93
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is enabled"
\| * \| \|	Merge branch 'feature/customizable-favicon' into 'master'	Douwe Maan	2018-06-07	4	-4/+21
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
\| \| * \|	find assets in test for CI and local test	Alexis Reigel	2018-06-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to the change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14583/diffs we can't use the same method to access assets in a CI and the local test environment anymore.
\| \| * \|	use Gitlab::Favicon for jira service	Alexis Reigel	2018-06-05	1	-1/+17
\| \| \| \|
\| \| * \|	remove all .ico favicon variations, use png always	Alexis Reigel	2018-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the ci status icons are generated client side, wo we don't need the static files anymore.
\| \| * \|	send ico files with inline disposition	Alexis Reigel	2018-06-05	3	-3/+3
\| \| \| \|
\| * \| \|	Merge branch '47208-human-import-status-name-not-working' into 'master'	Douwe Maan	2018-06-07	1	-0/+25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "ActionView::Template::Error: undefined method `human_import_status_name" Closes #47208 See merge request gitlab-org/gitlab-ce!19470
\| \| * \| \|	Adds #human_import_status_name to make it comply with ↵47208-human-import-status-name-not-working	Tiago Botelho	2018-06-06	1	-0/+25
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	ProjectImportState#human_status_name
* \| \| \|	Add spec for continuous deploy strategy	Matija Čupić	2018-06-07	1	-0/+13
\| \| \| \|
* \| \| \|	Merge branch 'master' into 38542-application-control-panel-in-settings-page	Matija Čupić	2018-06-06	16	-49/+593
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch '42751-rename-master-to-maintainer' into 'master'	Sean McGivern	2018-06-06	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Rename the `Master` role to `Maintainer`" Closes #42751 See merge request gitlab-org/gitlab-ce!19080
\| \| * \| \|	Fix spec	Mark Chao	2018-06-06	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix typos and add a small spec	Shinya Maeda	2018-06-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fix the query to select stale live traces	Shinya Maeda	2018-06-06	2	-40/+20
\| \| \| \| \|
\| * \| \| \|	Move find_builds_from_stale_live_traces method to Ci::Build	Shinya Maeda	2018-06-06	1	-6/+6
\| \| \| \| \|
\| * \| \| \|	Rename find_stale_in_batches to find_builds_from_stale_live_trace. Fix comments	Shinya Maeda	2018-06-06	1	-6/+6
\| \| \| \| \|
\| * \| \| \|	Add tests for each new code	Shinya Maeda	2018-06-06	1	-0/+40
\| \|/ / /
\| * \| \|	Fix repository archive generation when hashed storage is enabled	Nick Thomas	2018-06-05	1	-0/+26
\| \| \| \|
\| * \| \|	Merge branch 'master' into ↵	Kamil Trzciński	2018-06-05	7	-42/+145
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
\| \| * \| \|	Find and mark more Git disk access locations	Jacob Vosmaer (GitLab)	2018-06-05	3	-9/+56
\| \| \| \| \|
\| \| * \| \|	Merge branch '46585-gdpr-terms-acceptance' into 'master'	Robert Speicher	2018-06-05	2	-0/+46
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Missing Accept button for terms of service" Closes #46585 See merge request gitlab-org/gitlab-ce!19156
\| \| \| * \| \|	Messaging on terms page when user already accepted46585-gdpr-terms-acceptance	tauriedavis	2018-06-04	2	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We show a blue flash banner if the user already accepted, and show a button allowing them to continue to the application.
\| \| * \| \| \|	Merge branch '42751-rename-mr-maintainer-push' into 'master'	Robert Speicher	2018-06-05	2	-25/+25
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rephrase Merge Request Maintainer Edit See merge request gitlab-org/gitlab-ce!19061
\| \| \| * \| \| \|	Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-push	Mark Chao	2018-06-01	2	-25/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	branch" "Maintainer" will be freed to be used for #42751
\| \| * \| \| \| \|	Merge branch 'optimise-runner-update-cached-info' into 'master'	Grzegorz Bizon	2018-06-05	1	-8/+18
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise runner update cached info See merge request gitlab-org/gitlab-ce!19187
\| \| \| * \| \| \|	Do not validate cached dataoptimise-runner-update-cached-info	Kamil Trzciński	2018-06-05	1	-8/+18
\| \| \| \| \|/ / \| \| \| \|/\| \|
\| * \| \| \| \|	Merge branch 'master' into ↵	Grzegorz Bizon	2018-06-05	1	-0/+72
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'backstage/gb/use-persisted-stages-to-improve-pipelines-table' # Conflicts: # db/schema.rb
\| \| * \| \| \|	Fix Rubocop offense in build specsbackstage/gb/fix-rubocop-offense-in-build-specs	Grzegorz Bizon	2018-06-05	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'optimise-pages-service-calling' into 'master'	Grzegorz Bizon	2018-06-05	1	-0/+72
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise pages service calling See merge request gitlab-org/gitlab-ce!19388
\| \| \| * \| \| \|	Remove PagesService and instead make it explicit that we call PagesWorkeroptimise-pages-service-calling	Kamil Trzciński	2018-06-05	1	-0/+72
\| \| \| \|/ / /
\| * \| \| \| \|	Merge branch 'master' into ↵backstage/gb/use-persisted-stages-to-improve-pipelines-table	Grzegorz Bizon	2018-06-05	23	-331/+476
\| \|\ \ \ \ \ \| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'backstage/gb/use-persisted-stages-to-improve-pipelines-table' Conflicts: app/models/ci/pipeline.rb
\| \| * \| \| \|	Merge branch 'rails5-fix-application-setting-spec' into 'master'	Nick Thomas	2018-06-04	1	-2/+1
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Write repository_storages without type casting Closes #46238 See merge request gitlab-org/gitlab-ce!19367
\| \| \| * \| \|	Fix repository_storage spec for Rails5rails5-fix-application-setting-spec	Jarka Kadlecová	2018-06-04	1	-2/+1
\| \| \| \|/ /
\| \| * \| \|	Merge branch 'master' into per-project-pipeline-iid	Shinya Maeda	2018-06-02	13	-172/+303
\| \| \|\ \ \
\| \| * \| \| \|	Remove unneccesary spec	Shinya Maeda	2018-06-01	1	-14/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Clean up presence validation spec	Shinya Maeda	2018-06-01	1	-2/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into per-project-pipeline-iid	Shinya Maeda	2018-06-01	6	-34/+77
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| * \| \| \|	Add spec for variables expression	Shinya Maeda	2018-05-30	1	-0/+14
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into per-project-pipeline-iid	Shinya Maeda	2018-05-30	7	-159/+152
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'master' into per-project-pipeline-iid	Shinya Maeda	2018-05-28	11	-105/+418
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' into per-project-pipeline-iid	Shinya Maeda	2018-05-22	11	-21/+430
\| \| \|\ \ \ \ \ \