Commit Graph

7634 Commits

Author SHA1 Message Date
Dimitrie Hoekstra f4e9af2b4b Added popover paradigm to ux guide 2017-10-05 19:11:13 +00:00
Nick Thomas ce87f42dc9 Merge branch '34102-online-view-of-artifacts-fe' into 'master'
Add external link for online artifacts

Closes #34102

See merge request gitlab-org/gitlab-ce!14399
2017-10-05 15:03:17 +00:00
Sean McGivern 1fe7a42afc Merge branch 'digitalmoksha/gitlab-ce-feature/verify_secondary_emails' into 'master'
Send a confirmation email when the user adds a secondary email address

Closes #37385, #28621, and #36959

See merge request gitlab-org/gitlab-ce!14703
2017-10-05 12:12:30 +00:00
Lee Matos cc35c64207 Update github.md importer docs to clarify branches from forks get created in GL 2017-10-05 11:26:21 +00:00
Douwe Maan 0c0c2ecd99 Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails
# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb
2017-10-05 12:48:22 +02:00
Eric Eastwood 7b0ca61fe3 Clarify where the artifacts metadata .gz is generated 2017-10-05 02:56:52 -05:00
Rémy Coutable 5f32a511f8 Merge branch 'docs/openid-connect' into 'master'
Add link to OpenID Connect documentation

See merge request gitlab-org/gitlab-ce!14368
2017-10-04 17:02:45 +00:00
Rémy Coutable 502a3a29bd Merge branch 'merge-request-doco' into 'master'
explain target_project_id vs project_id

Closes #38539

See merge request gitlab-org/gitlab-ce!14594
2017-10-04 16:58:14 +00:00
Eric Eastwood decf044369 Merge branch 'master' into 34102-online-view-of-artifacts-fe 2017-10-04 10:56:03 -05:00
Job van der Voort f685c368ea Merge branch 'docs/images-update' into 'master'
Update images

Closes #38487

See merge request gitlab-org/gitlab-ce!14655
2017-10-04 14:46:02 +00:00
Achilleas Pipinellis da05687d90
Update a bunch of docs images 2017-10-04 15:47:59 +02:00
Jacob Vosmaer 147e2b21be Let fetch_ref pull from Gitaly instead of from disk 2017-10-04 12:57:41 +02:00
Filipa Lacerda 88959e872e Merge branch '3612-update-script-template-order-in-vue-files' into 'master'
Re-arrange <script> tags before <template> tags in .vue files

Closes #38743

See merge request gitlab-org/gitlab-ce!14671
2017-10-04 08:46:31 +00:00
Eric Eastwood b88f70606d Re-arrange <script> tags before <template> tags in .vue files
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38743
2017-10-03 19:12:53 -05:00
Winnie Hellmann 9ba0454553 Fix link to Vue.js style guide 2017-10-03 19:47:07 +00:00
David Turner ab2e448083 explain target_project_id vs project_id 2017-10-03 13:26:44 -04:00
Tim Zallmann 23e6b17b3e Merge branch 'winh-sprintf' into 'master'
Add basic sprintf implementation to JavaScript

See merge request gitlab-org/gitlab-ce!14506
2017-10-03 15:56:40 +00:00
Dimitrie Hoekstra fe3d966781 Added skeleton loading paradigm to UX guide 2017-10-03 15:26:45 +00:00
Winnie Hellmann b509588a28 Add basic sprintf implementation to JavaScript 2017-10-03 14:46:19 +02:00
Jacob Vosmaer (GitLab) 2e76c604df Add grpc.log for Gitaly 2017-10-03 11:28:40 +00:00
Achilleas Pipinellis ae9dd4b552 Merge branch 'docs-add-summary-about-project-archiving' into 'master'
Add documentation to summarise project archiving

Closes #35919

See merge request gitlab-org/gitlab-ce!14650
2017-10-03 11:14:21 +00:00
Mark Fletcher ce7f297a7f Add documentation to summarise project archiving 2017-10-03 15:57:20 +07:00
Eric Eastwood 1bc5d24afd Restore lost artifacts browser image 2017-10-03 01:52:31 -05:00
Eric Eastwood bca86c858b Add test for external HTML artifact 2017-10-03 00:33:13 -05:00
Eric Eastwood 8cf22babec Add docs for online view of HTML artifacts 2017-10-02 17:11:02 -05:00
Valery Sizov e559b8511b Update MR doc to indicate that the linear-history feature is available for CE as well 2017-10-02 14:29:17 +03:00
Valery Sizov a0ac2d932c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ff_port_from_ee 2017-10-02 13:15:46 +03:00
Achilleas Pipinellis b69aab6e20 Merge branch '38616-take-down-references-to-gitlab-chart-docs' into 'master'
Updates to Helm chart docs

Closes #38616

See merge request gitlab-org/gitlab-ce!14589
2017-10-02 06:15:09 +00:00
Joshua Lambert 1e9f9d97e1 minor cleanup 2017-10-01 22:04:18 -04:00
Joshua Lambert 2420ff749f minor cleanup 2017-09-30 13:48:35 -04:00
Joshua Lambert 1c46d27d9e updates 2017-09-30 13:35:13 -04:00
Joshua Lambert 654b635c58 Fix dead link 2017-09-30 13:32:39 -04:00
Andrew Newdigate 2146d6253f Add environment variable to bypass n+1 2017-09-30 16:26:23 +00:00
Joshua Lambert 98bfbd49ac updates 2017-09-30 02:28:47 -04:00
Ben Bodenmiller 80957f7404 remove period
[skip ci]
2017-09-30 03:02:42 +00:00
Valery Sizov 29b2efb610 Backport documentation for semi-linear history 2017-09-29 19:42:16 +03:00
Fabio Busatto 6e6e0c0453 Fix Auto DevOps banner feature flag 2017-09-29 08:38:45 +00:00
Mike Greiling 7639e4ab20 Merge branch '31113-add-guidelines-for-illustrations' into 'master'
Guidelines for illustrations

See merge request gitlab-org/gitlab-ce!13097
2017-09-29 04:27:48 +00:00
Eric Eastwood 3468ca835d Merge branch 'master' into ff_port_from_ee
Conflicts:
	app/models/project.rb
	db/schema.rb
2017-09-28 16:59:49 -05:00
Marcia Ramos f0ff0dd1ed Docs: Feature overview and use cases 2017-09-28 18:36:19 +00:00
Achilleas Pipinellis 038b44efe4 Merge branch 'docs-crosslink-pages-guides' into 'master'
Docs: crosslink Pages guides

Closes #38427

See merge request gitlab-org/gitlab-ce!14542
2017-09-28 17:55:23 +00:00
Douwe Maan ae03a52f09 Merge branch 'hashed-storage-migration-path' into 'master'
Hashed storage migration path

Closes gitlab-ee#3118

See merge request gitlab-org/gitlab-ce!14067
2017-09-28 17:26:16 +00:00
Marcia Ramos 98f4c8cb5b copyedit - reorg headers 2017-09-28 14:01:15 -03:00
Markus Koller e9eae3eb0d Support custom attributes on users 2017-09-28 16:49:42 +00:00
Marcia Ramos aa21f09353 copyedit + last_updated 2017-09-28 13:49:34 -03:00
Marcia Ramos 77ec130e33 add note on DNS propagation time 2017-09-28 13:41:53 -03:00
Marcia Ramos e59042a3ed add section "Add your custom domain to GitLab Pages settings" 2017-09-28 13:36:24 -03:00
Dominik bf5c2ff868 Document the usage of the Docker OverlayFS driver for every build 2017-09-28 16:28:02 +00:00
Gabriel Mazetto f4de14d71f
Add support to migrate existing projects to Hashed Storage async 2017-09-28 16:32:14 +01:00
Robert Speicher 06daba75aa Merge branch 'evn-add-neg-tests' into 'master'
Test for what should not be there as well

[ci skip]

See merge request gitlab-org/gitlab-ce!14492
2017-09-28 13:43:05 +00:00