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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch ↵	Douwe Maan	2018-05-22	1	-8/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474
\| *	Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmed	Rémy Coutable	2018-05-22	1	-8/+19
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'ab-43706-composite-primary-keys' into 'master'	Yorick Peterse	2018-05-22	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migration to add primary key constraint for composite keys Closes #43706 and #32258 See merge request gitlab-org/gitlab-ce!18980
\| * \|	Add NOT NULL constraints to project_authorizations.	Andreas Brandl	2018-05-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #32258.
* \| \|	Expose readme url in Project API	Imre Farkas	2018-05-22	1	-0/+7
\| \|/ \|/\|
* \|	Merge branch 'rename-merge-request-widget-author-component' into 'master'	Phil Hughes	2018-05-22	3	-5/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Rename merge request widget author component See merge request gitlab-org/gitlab-ce!19079
\| * \|	Rename merge request widget author component	George Tsiolis	2018-05-22	3	-5/+5
\| \| \|
* \| \|	Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into ↵	Douwe Maan	2018-05-22	2	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fixed badge api endpoint route when relative_url is set Closes #46411 See merge request gitlab-org/gitlab-ce!19004
\| * \| \|	Fixed badge api endpoint route when relative_url is setfj-46411-fix-badge-api-endpoint-route-with-relative-url	Francisco Javier López	2018-05-17	2	-4/+4
\| \| \| \|
* \| \| \|	Renamed 'Overview' to 'Project' in collapsed contextual navigation at a ↵	Constance Okoghenun	2018-05-21	1	-1/+1
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	project level
* \| \|	Merge branch '45746-fix-container-registry-typo' into 'master'	Rémy Coutable	2018-05-21	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Registry page text is wrong and contains broken links." Closes #45746 See merge request gitlab-org/gitlab-ce!18711
\| * \|	Fix a typo in the Registry index	Mark Fletcher	2018-05-03	1	-1/+1
\| \| \|
* \| \|	Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into ↵	Grzegorz Bizon	2018-05-21	2	-1/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Do not allow to use `CI_PIPELINE_ID` in environment name Closes #46443 See merge request gitlab-org/gitlab-ce!19032
\| * \| \|	Separate persisted and runtime pipeline variables	Grzegorz Bizon	2018-05-18	2	-1/+2
\| \| \| \|
\| * \| \|	Do not allow to use `CI_PIPELINE_ID` in environment name	Grzegorz Bizon	2018-05-18	1	-2/+7
\| \| \| \|
* \| \| \|	Merge branch 'add-broadcast-message-timezone-label' into 'master'	Kamil Trzciński	2018-05-21	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add timezone information to the datetime select labels Closes #23389 See merge request gitlab-org/gitlab-ce!18987
\| * \| \| \|	Add timezone information to the date time select labels	Andreas Kämmerle	2018-05-16	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master'	Kamil Trzciński	2018-05-21	4	-5/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Runner#contacted_at is not always a Time type" Closes #46082 See merge request gitlab-org/gitlab-ce!18810
\| * \| \| \| \|	Revert "Improve cacheable module"46082-runner-contacted_at-is-not-always-a-time-type	Matija Čupić	2018-05-18	1	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2ebafdfb2f026580153fd2cf50f4b6b7ab3a0344
\| * \| \| \| \|	Improve cacheable module	Kamil Trzciński	2018-05-18	1	-5/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Include class name and argument name in argument error	Matija Čupić	2018-05-17	1	-1/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Use Gitlab.rails5? for checking if on rails5	Matija Čupić	2018-05-17	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Revert "Move argument check to cached getter definition class method"	Matija Čupić	2018-05-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4e1bb1d1014237df79db6b3cc2beb24228a4b228.
\| * \| \| \| \|	Move argument check to cached getter definition class method	Matija Čupić	2018-05-16	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Add attribute check in cached getter	Matija Čupić	2018-05-16	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Move attribute casting to #cached_attribute	Matija Čupić	2018-05-16	1	-4/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Dynamically cast value from cache	Matija Čupić	2018-05-15	2	-11/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Clear memoization after caching new values	Matija Čupić	2018-05-11	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Use symbol instead of string in RedisCacheable attribute definitions	Matija Čupić	2018-05-10	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into 46082-runner-contacted_at-is-not-always-a-time-type	Matija Čupić	2018-05-09	24	-86/+89
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Revert "Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix ↵	Matija Čupić	2018-05-09	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	runner pages" This reverts commit b14719ea04f29888e2bbbdccda872d3cb4e70ae7.
\| * \| \| \| \| \|	Move Runner#contacted_at to RedisCacheable#cached_attr_time_reader	Matija Čupić	2018-05-08	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add cached_attr_time_reader to RedisCacheable	Matija Čupić	2018-05-08	1	-0/+9
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master'	Kamil Trzciński	2018-05-21	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "CI/CD jobs: Wrong value in env. variable CI_DEPLOY_USER using <gitlab-deploy-token> deploy token" Closes #46454 See merge request gitlab-org/gitlab-ce!19047
\| * \| \| \| \| \| \|	Fixes deploy tokens build variables46454-wrong-value-in-ci-deploy-user	Mayra Cabrera	2018-05-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was using name, instead of username. Fixes documentation as well Closes #46454
* \| \| \| \| \| \| \|	Merge branch 'jr-web-ide-shortcuts' into 'master'	Tim Zallmann	2018-05-21	1	-0/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add web shortcut to docs and shortcut modal Closes #46385 See merge request gitlab-org/gitlab-ce!19044
\| * \| \| \| \| \| \| \|	Add web shortcut to docs and shortcut modaljr-web-ide-shortcuts	James Ramsay	2018-05-18	1	-0/+11
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch '5845-extract-ee-environments-files' into 'master'	Phil Hughes	2018-05-21	3	-27/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces vue resource with axios for environments code See merge request gitlab-org/gitlab-ce!18950
\| * \ \ \ \ \ \ \	Merge branch 'master' into 5845-extract-ee-environments-files5845-extract-ee-environments-files	Filipa Lacerda	2018-05-18	45	-456/+611
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (69 commits) Calculating repository checksums executed by Gitaly Resolve "Expand API: Render an arbitrary Markdown document" Update EE > CE downgrade service removal steps Make stores export a createStore() which can be used in tests Simplify pattern lexeme fabrication and matcher Simplify untrusted regexp factory method Fix api_json.log not always reporting the right HTTP status code Move group lists css from framework/lists.scss to pages/groups.scss Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar" Add Keyboard shortcuts for "Kubernetes" and "Environments" Move API group deletion to Sidekiq fix typos. add a reference to deliverable and stretch for design artifact fix / assigne username wrapping problem has been fixed Memoize Gitlab::Database.version Conditionally add Gitaly deprecation warnings based on ENV variable Bring CE-EE parity to app/services/milestones/base_service.rb Bring CE-EE parity to app/services/lfs/unlock_file_service.rb Fixes 500 error on /estimate BIG_VALUE Fix: Use case in-sensitive ordering by name for groups Fix group lists visual ...
\| * \| \| \| \| \| \| \|	Update method name	Filipa Lacerda	2018-05-17	2	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	[ci skip] Merge branch 'master' into 5845-extract-ee-environments-files	Filipa Lacerda	2018-05-17	23	-62/+148
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (24 commits) Remove unneccessary imports fixed copy to cliboard button in embedded snippets Fix Error 500 viewing admin page due to statement timeouts Workhorse to send raw diff and patch for commits Refactor out duplication in runner_policy.rb Remove unnecessary runner.is_shared? checks in api because they are handled by policy Allow admin to assign shared runner to project through API Change policy list_runner_jobs -> read_runner Rename User#ci_authorized_runners -> ci_owned_runners Improve efficiency of authorized_runner policy query Use can? policies for lib/api/runners.rb Allow group runners to be viewed/edited in API Whitelisted query limits for group destroy API Fixed typo Changed order of include Use find_in_batches instead of destroy_all Delete remote uploads Use correct base width Refactor duplicate code Add changelog entry for contrib graphs width fix ...
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into 5845-extract-ee-environments-files	Filipa Lacerda	2018-05-16	26	-116/+270
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (79 commits) Project Sidebar: Split CI/CD into CI/CD and Operations Fix GPM content types for Doorkeeper Remove docker pull prefix from registry clipboard feature Remove unnecessary section-100 css class from application_row.vue Document the 3h timeout for GitLab.com shared Runners edit GitLab license info in regards to CC licensing Fix bug with long strings in issue boards Fix setting Gitlab metrics content types Add documentation for bulk editing of issues and merge requests Remove authentication for readonly endpoints in issues API Remote table-section from div holding cluster error messages Improve testing best practices guidelines Add a unique and not null constraint on the project_features.project_id column fix typos Frontend Guide, development_process.md Disable greedy mode when matching filename Add index on runner_type for ci_runners Improve the squash step in the 'Database Changes' MR template Update docs describing `fast_spec_helper` best practices Display help text below auto devops domain with nip.io domain name (#45561) Enable update_(build\|pipeline) for maintainers ...
\| * \| \| \| \| \| \| \| \| \|	Replace vue resource with axios for environments	Filipa Lacerda	2018-05-14	3	-23/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '44799-api-naming-issue-scope' into 'master'	Rémy Coutable	2018-05-21	3	-6/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "API naming for issue scope" Closes #44799 See merge request gitlab-org/gitlab-ce!18935
\| * \| \| \| \| \| \| \| \| \| \|	Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scope	Mark Chao	2018-05-21	3	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecate corresponding dash versions created-by-me and assigned-to-me
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '45065-users-projects-json-sort' into 'master'	Rémy Coutable	2018-05-21	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UsersController#projects.json sort order Closes #45065 See merge request gitlab-org/gitlab-ce!18227
\| * \| \| \| \| \| \| \| \| \| \| \|	Order UsersController#projects.json by updated_at	Takuya Noguchi	2018-05-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Rescue Kubeclient::HttpError when generating prometheus_client	Shinya Maeda	2018-05-21	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-chmod' into 'master'	Stan Hu	2018-05-18	1	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Chmod 644 on offending files See merge request gitlab-org/gitlab-ce!19051
\| * \| \| \| \| \| \| \| \| \| \| \|	Chmod 644 on offending filesdocs/fix-chmod	Achilleas Pipinellis	2018-05-18	1	-0/+0
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|