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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'	Kamil Trzciński	2018-02-08	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Expose GitLab license/plan as a CI/CD variable" Closes #40994 See merge request gitlab-org/gitlab-ce!16936
\| *	Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variable	Dylan Griffith	2018-02-07	1	-0/+1
\| \|
* \|	Resolve "New design for user deletion confirmation in admin area"	Shah El-Rahman	2018-02-08	1	-4/+4
\| \|
* \|	Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into ↵	Clement Ho	2018-02-08	3	-12/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "New design for cancel / stop pipeline confirmation" Closes #41297 See merge request gitlab-org/gitlab-ce!16813
\| * \|	Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmation	Shah El-Rahman	2018-02-07	3	-12/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests Address code review feedback Fix tests
* \| \|	Migrate Git::Blob.batch to Gitaly	Ahmad Sherif	2018-02-08	2	-42/+88
\| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#985
* \| \|	Merge branch '42462-edit-note' into 'master'	Fatih Acet	2018-02-07	2	-47/+66
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Cancelling a second comment edit doesn't return its state to before the edit" Closes #42462 See merge request gitlab-org/gitlab-ce!16869
\| * \| \|	Resolve "Cancelling a second comment edit doesn't return its state to before ↵	Simon Knox	2018-02-07	2	-47/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the edit"
* \| \| \|	Replace $.ajax in profile.js with axios	Clement Ho	2018-02-07	1	-0/+9
\|/ / /
* \| \|	Merge branch 'fix/cache-gitaly-find-commits' into 'master'	Sean McGivern	2018-02-07	1	-0/+26
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache Gitaly FindCommit RPC response See merge request gitlab-org/gitlab-ce!16949
\| * \| \|	Cache Gitaly FindCommit RPC responsefix/cache-gitaly-find-commits	Ahmad Sherif	2018-02-07	1	-0/+26
\| \| \| \|
* \| \| \|	Merge branch 'fix_help_controller_spec' into 'master'	Sean McGivern	2018-02-07	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating `HelpController` spec to use an existing image See merge request gitlab-org/gitlab-ce!16977
\| * \| \| \|	Updating `HelpController` spec to use an existing image	Mario de la Ossa	2018-02-07	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch '4656-ce-port-filtered-search-bar' into 'master'	Clement Ho	2018-02-07	6	-32/+36
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port: for Filtered search releated changes See merge request gitlab-org/gitlab-ce!16917
\| * \| \| \|	Import FilteredSearchTokenKeys, update class initialization syntax4656-ce-port-filtered-search-bar	Kushal Pandya	2018-02-07	1	-5/+6
\| \| \| \| \|
\| * \| \| \|	Import and use `FilteredSearchTokenKeys` independently	Kushal Pandya	2018-02-07	5	-27/+30
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'ce-4813-fix-ee-projects-destroy_service_spec' into 'master'	Sean McGivern	2018-02-07	4	-19/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reset column information after the schema is migrated in MigrationsHelpers.schema_migrate_up! Closes gitlab-ee#4813 See merge request gitlab-org/gitlab-ce!16950
\| * \| \| \|	Reset column information after the schema is migrated in ↵ce-4813-fix-ee-projects-destroy_service_spec	Rémy Coutable	2018-02-07	4	-19/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MigrationsHelpers.schema_migrate_up! Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'clear-job-request-timeout' into 'master'	Filipa Lacerda	2018-02-07	1	-18/+27
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear the timeout in Jobs class after each test Closes #42830 See merge request gitlab-org/gitlab-ce!16969
\| * \| \| \| \|	Clear the timeout in Jobs class after each test	Phil Hughes	2018-02-07	1	-18/+27
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'	Robert Speicher	2018-02-07	10	-49/+332
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
\| * \| \| \| \| \|	Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480	Pawel Chojnacki	2018-02-07	1	-0/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix order of checks in editable? method.	Pawel Chojnacki	2018-02-07	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ address small nitpicks
\| * \| \| \| \| \|	Make prometheus service querying approach much nicer wrt to arity and ↵	Pawel Chojnacki	2018-02-07	2	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default function params
\| * \| \| \| \| \|	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	Mike Greiling	2018-02-06	208	-1797/+6435
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
\| * \| \| \| \| \| \|	fix tests for find or initialize service 'prometheus'	Pawel Chojnacki	2018-02-06	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix broken karma specs due to removed function	Mike Greiling	2018-01-31	2	-28/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480	Mike Greiling	2018-01-31	46	-529/+1088
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
\| * \| \| \| \| \| \| \|	enable manual configuration property for all test prometheus services	Pawel Chojnacki	2018-01-30	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2018-01-29	281	-3031/+5109
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pawel/connect_to_prometheus_through_proxy-30480
\| * \| \| \| \| \| \| \| \|	add manual_configuration to prometheus_service factory to enable it by default	Pawel Chojnacki	2018-01-17	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into ↵	Pawel Chojnacki	2018-01-17	307	-2037/+8200
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pawel/connect_to_prometheus_through_proxy-30480
\| * \| \| \| \| \| \| \| \| \|	Fix rubocop warnings	Pawel Chojnacki	2018-01-04	3	-10/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Test Prometheus proxy client generation	Pawel Chojnacki	2018-01-04	1	-0/+51
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	add tests for Manual configuration override and service activation ↵	Pawel Chojnacki	2018-01-04	1	-0/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	synchronization
\| * \| \| \| \| \| \| \| \| \|	Cleanup PrometheusService tests	Pawel Chojnacki	2018-01-04	1	-33/+38
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Cleanup implementation and add cluster finding tests	Pawel Chojnacki	2018-01-04	1	-0/+127
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix prometheus client tests	Pawel Chojnacki	2018-01-04	1	-6/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add test checking if prometheus integration is enabled after prometheus is ↵	Pawel Chojnacki	2018-01-04	3	-2/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	installed
* \| \| \| \| \| \| \| \| \| \|	Merge branch '3559-ce-port-group-roadmap' into 'master'	Filipa Lacerda	2018-02-07	3	-0/+99
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Port for Group Roadmap changes See merge request gitlab-org/gitlab-ce!16908
\| * \| \| \| \| \| \| \| \| \| \|	Add `convertObjectPropsToCamelCase` helper method	Kushal Pandya	2018-02-07	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add `convertToCamelCase` helper method	Kushal Pandya	2018-02-07	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Update tests for date helper functions	Kushal Pandya	2018-02-07	1	-0/+64
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Removing gitaly flags	Francisco Javier López	2018-02-07	4	-364/+404
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'zj-refs-hash' into 'master'	Sean McGivern	2018-02-07	2	-5/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use rugged in Repository#refs_hash Closes gitaly#880 See merge request gitlab-org/gitlab-ce!16827
\| * \| \| \| \| \| \| \| \| \| \|	Don't use rugged in Repository#refs_hash	Zeger-Jan van de Weg	2018-02-07	2	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The refs hash is used to determine what branches and tags have a commit as head in the network graph. The previous implementation depended on Rugged#references. The problem with this implementation was that it depended on rugged, but also that it iterated over all references and thus loading more data than needed if for example the project uses CI/CD environments, Pipelines, or Merge Requests. Given only refs are checked the network cares about the GraphHelper#refs method has no need to reject those, simplifying the method. Closes gitlab-org/gitaly#880
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'	Sean McGivern	2018-02-07	13	-1/+582
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport LFS File Locking API Closes #35856 See merge request gitlab-org/gitlab-ce!16935
\| * \| \| \| \| \| \| \| \| \| \| \|	Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-api	Rubén Dávila	2018-02-07	13	-1/+582
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '41763-search-api' into 'master'	Sean McGivern	2018-02-07	11	-95/+553
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Search API Closes #41763 See merge request gitlab-org/gitlab-ce!16878
\| * \| \| \| \| \| \| \| \| \| \| \|	port ee changes	Jarka Kadlecová	2018-02-07	2	-93/+98
\| \| \| \| \| \| \| \| \| \| \| \| \|