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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'edge-cases-integration-frontend-testing' into 'master'	Clement Ho	2017-06-07	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update testing.md `# Frontend Testing` to include integration spec for edge cases See merge request !11784
\| *	Update testing.md `# Frontend Testing` to include integration spec for edge ↵edge-cases-integration-frontend-testing	Luke "Jared" Bennett	2017-05-30	1	-1/+1
\| \| \| \| \| \| \| \|	cases
* \|	Fix URLs in artifacts documentation	Douwe Maan	2017-06-07	1	-2/+2
\| \|
* \|	Merge branch 'docs/private-registry' into 'master'	Sean Packham	2017-06-07	1	-16/+54
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more info about private Docker registry Closes #4028 See merge request !11945
\| * \|	Add more info on private Registry docsdocs/private-registry	Achilleas Pipinellis	2017-06-06	1	-16/+54
\| \| \|
* \| \|	Merge branch 'docs/expiring-artifacts' into 'master'	Sean Packham	2017-06-07	2	-9/+53
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more info on artifacts expiry date Closes #18694 See merge request !11942
\| * \| \|	Add more info on artifacts expiry datedocs/expiring-artifacts	Achilleas Pipinellis	2017-06-06	2	-9/+53
\| \|/ /
* \| \|	Merge branch '12910-snippets-description' into 'master'	Phil Hughes	2017-06-07	2	-14/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support descriptions for snippets Closes #31894 See merge request !11071
\| * \| \|	Support uploads for newly created personal snippets12910-snippets-description	Jarka Kadlecova	2017-06-07	1	-1/+1
\| \| \| \|
\| * \| \|	Support descriptions for snippets	Jarka Kadlecova	2017-05-31	2	-15/+23
\| \| \| \|
* \| \| \|	Merge branch 'zj-read-registry-pat' into 'master'	Kamil Trzciński	2017-06-07	1	-6/+7
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow pulling container images using personal access tokens Closes #19219 See merge request !11845
\| * \| \|	Create read_registry scope with JWT auth	Z.J. van de Weg	2017-06-05	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the first commit doing mainly 3 things: 1. create a new scope and allow users to use it 2. Have the JWTController respond correctly on this 3. Updates documentation to suggest usage of PATs There is one gotcha, there will be no support for impersonation tokens, as this seems not needed. Fixes gitlab-org/gitlab-ce#19219
* \| \| \|	Merge branch 'docs/registry-self-sign' into 'master'	Sean Packham	2017-06-06	1	-10/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add info on using self-signed certs with Registry Closes #18239 See merge request !11938
\| * \| \| \|	Add info on using self-signed certs with Registry	Achilleas Pipinellis	2017-06-06	1	-10/+20
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/powershell-ci-vars' into 'master'	Sean Packham	2017-06-06	2	-4/+49
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add PowerShell to CI variable docs See merge request !11935
\| * \| \| \|	Add PowerShell to CI variable docsdocs/powershell-ci-vars	John Spaetzel	2017-06-06	2	-4/+49
\| \| \| \| \|
* \| \| \| \|	Introduce optimistic locking support via optional parameter last_commit_id ↵	Roman Safronov	2017-06-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	on File Update API
* \| \| \| \|	Merge branch 'fix_explanation_of_job_level_variable_override' into 'master'	Grzegorz Bizon	2017-06-06	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update explanation of job-level variable override to fit example See merge request !11923
\| * \| \| \| \|	Update explanation of job-level variable override to fit example	Tor Bechmann Yamamoto-Sørensen	2017-06-06	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Accept a username for User-level Events API	Mark Fletcher	2017-06-06	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Introduce an Events API	Mark Fletcher	2017-06-06	4	-277/+350
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Meld the following disparate endpoints: * `/projects/:id/events` * `/events` * `/users/:id/events` + Add result filtering to the above endpoints: * action * target_type * before and after dates
* \| \| \| \|	Merge branch 'evn-crosslink-to-architecture' into 'master'	Achilleas Pipinellis	2017-06-06	1	-3/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sketch dynamic and link back to production architecture See merge request !11617
\| * \| \| \| \|	Per discussionevn-crosslink-to-architecture	Ernst van Nierop	2017-05-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Make sketch dynamic and link back to production architecture	ernstvn	2017-05-22	1	-3/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Remove references to old settings location	Achilleas Pipinellis	2017-06-06	7	-32/+14
\| \| \| \| \| \|
* \| \| \| \| \|	Resolve "API: Environment info missed"	Sébastien	2017-06-06	2	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '32236-fix-typo-in-helm-chart-installation-doc' into 'master'	Achilleas Pipinellis	2017-06-06	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in helm chart installation doc (#32236) Closes #32236 See merge request !11891
\| * \| \| \| \| \|	Fix typo on namespace	Sébastien	2017-06-03	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dz-backport-codeclimate-docs' into 'master'	Achilleas Pipinellis	2017-06-06	1	-3/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport CI codeclimate example doc change from EE See merge request !11903
\| * \| \| \| \| \| \|	Fix link to ee code quality docdz-backport-codeclimate-docs	Dmitriy Zaporozhets	2017-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Backport CI codeclimate example doc change from EE	Dmitriy Zaporozhets	2017-06-05	1	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'add-note-on-body-size' into 'master'	Achilleas Pipinellis	2017-06-06	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note on customizing body size to support Registry See merge request !11904
\| * \| \| \| \| \| \| \|	Update gitlab_chart.mdadd-note-on-body-size	Joshua Lambert	2017-06-05	1	-1/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'patch-23' into 'master'	Achilleas Pipinellis	2017-06-06	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Corrected spelling mistake in permissions.md "it total" -> "in total". See merge request !11908
\| * \| \| \| \| \| \| \| \|	Corrected spelling mistake in permissions.md "it total" -> "in total".	Andrew Featherstone	2017-06-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-headings-for-seo' into 'master'	Achilleas Pipinellis	2017-06-06	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issues documentation: improve SEO See merge request !11919
\| * \| \| \| \| \| \| \| \|	change headings to improve SEOdocs/fix-headings-for-seo	Marcia Ramos	2017-06-06	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '29690-rotate-otp-key-base' into 'master'	Brian Neel	2017-06-06	1	-0/+79
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a Rake task to aid in rotating otp_key_base Closes #29690 See merge request !11881
\| * \| \| \| \| \| \| \| \|	Add a Rake task to aid in rotating otp_key_base	Nick Thomas	2017-06-05	1	-0/+79
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Support hard deletion in Admin::UsersController#destroy	Nick Thomas	2017-06-05	1	-1/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'	Kamil Trzciński	2017-06-05	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add slugified project path to CI environment variables Closes #31061 See merge request !11838
\| * \| \| \| \| \| \| \|	Add slugify project path to CI enviroment variables	vanadium23	2017-06-03	1	-1/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '25680-CI_ENVIRONMENT_URL' into 'master'	Kamil Trzciński	2017-06-05	2	-0/+7
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `$CI_ENVIRONMENT_URL` as a job variable Closes #25680 See merge request !11695
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL	Lin Jen-Shin	2017-06-02	9	-21/+126
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (39 commits) Resolve "Improve Container Registry description" Add username parameter to gravatar URL Fix replying to a commit discussion displayed in the context of an MR Add fog-aliyun as backup storage provider Add missing specs Make sure protected can't be null; Test protected! Update session cookie key name to be unique to instance in development Just mention which GitLab version is required Fix data inconsistency issue for old artifacts by moving them to a currently used path Fix N+1 queries for non-members in comment threads Fix rubocop in spec/helpers/diff_helper_spec.rb Merge two items into one in the doc Only remove FK if it exists Maintain notes avatar at smaller breakpoint Fix pipeline schedule value name in documentation Add test for Project#protected_for? Update diff discussion position per discussion instead of per note Display Shared Runner status in Admin Dashboard Make sure we're loading the fresh variables Now secret_variables_for would return the variables ...
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL	Lin Jen-Shin	2017-06-01	12	-18/+699
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (251 commits) Don't match email addresses or foo@bar as user references Revert "Update GITLAB_SHELL_VERSION" Update GITLAB_SHELL_VERSION Add feature toggles through Flipper Change no_limits to limits Move includes call to scope Add GitLab Resources to University Add Documentation for GIT_CHECKOUT variable Remove entry variable Do not try to preload Commits when using Note.includes(:noteable) Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Introduce source to pipeline entity Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions ...
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'	Lin Jen-Shin (godfat)	2017-05-26	11	-8/+78
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \| \| \| \|	Pass external_url from environment if job doesn't have one	Lin Jen-Shin	2017-05-25	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update the document and add a changelog entry
* \| \| \| \| \| \| \| \| \| \|	Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for ↵	Sébastien	2017-06-04	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	variables"
* \| \| \| \| \| \| \| \| \| \|	Merge branch '31943-document-go-18' into 'master'	Achilleas Pipinellis	2017-06-03	2	-16/+35
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document go1.8.3 as dependency See merge request !11245
\| * \| \| \| \| \| \| \| \| \|	Go 1.8.3 and Upgrade-9.3 doc	Kim "BKC" Carlbäcker	2017-06-02	2	-12/+32
\| \| \| \| \| \| \| \| \| \| \|