2f96930d5c
Merge branch 'winh-stop-all-environments' into 'master'
...
Support manually stopping any environment from the UI
Closes #25388
See merge request gitlab-org/gitlab-ce!20077
2018-07-10 08:11:04 +00:00
d79cef3a9a
Support manually stopping any environment from the UI
2018-07-10 08:11:04 +00:00
ca1deb9e5e
Merge branch '48951-clean-up' into 'master'
...
Resolve "MR refactor: All actions under diff module are being exported twice"
Closes #48951
See merge request gitlab-org/gitlab-ce!20499
2018-07-10 07:38:48 +00:00
255db3d597
Merge branch 'winh-fix-frontend-link-docs' into 'master'
...
Fix link to frontend in handbook
See merge request gitlab-org/gitlab-ce!20504
2018-07-09 21:35:37 +00:00
6b733bc457
Fix link to frontend in handbook
2018-07-09 21:35:37 +00:00
c0280ac379
Merge branch 'sh-shorten-filenames-changelog' into 'master'
...
Shorten CHANGELOG filename to avoid breaking ecryptfs users
Closes #49038
See merge request gitlab-org/gitlab-ce!20512
2018-07-09 21:00:50 +00:00
0198057b14
Shorten CHANGELOG filename to avoid breaking ecryptfs users
...
[ci skip]
Closes #49038
2018-07-09 13:57:08 -07:00
1fb0fc3ad3
Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
2018-07-09 20:45:06 +00:00
3edda4c257
Merge branch 'minor-update-ssh-key-docs' into 'master'
...
Add additional headline for Adding SSH keys to GitLab
Closes #46395
See merge request gitlab-org/gitlab-ce!20507
2018-07-09 17:17:59 +00:00
a0935bf267
Merge branch 'winh-waiting-in-tests-docs' into 'master'
...
Document that we don't want to wait in tests
See merge request gitlab-org/gitlab-ce!20502
2018-07-09 16:56:04 +00:00
e6a49b0076
Add additional headline for Adding SSH keys to GitLab
2018-07-09 16:34:50 +00:00
630dfb41b8
Merge branch 'od/41671' into 'master'
...
Preserve the correct start/due dates on milestones when editing
Closes #41671
See merge request gitlab-org/gitlab-ce!20279
2018-07-09 16:27:31 +00:00
2a4039cf66
Merge branch 'update-rubocop'
2018-07-09 17:23:30 +01:00
ab3c91a702
Merge branch 'dz-remote-badges-from-readme' into 'master'
...
Remove badges from README.md in favor of GitLab badges feature
Closes #48895
See merge request gitlab-org/gitlab-ce!20447
2018-07-09 16:20:22 +00:00
5535e51311
Merge branch 'master' into 'master'
...
Request to be a proofreader.
See merge request gitlab-org/gitlab-ce!19423
2018-07-09 16:15:43 +00:00
963cd5a5b3
Request to be a proofreader.
2018-07-09 16:15:43 +00:00
c7e980674e
Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master'
...
Rails5 mysql fix milliseconds problem in pull request importer spec
See merge request gitlab-org/gitlab-ce!20475
2018-07-09 16:15:34 +00:00
2cedb243ee
Merge branch 'gitaly-update-branch' into 'master'
...
Use Gitaly's OperationService.UserUpdateBranch RPC
Closes gitaly#1252
See merge request gitlab-org/gitlab-ce!20231
2018-07-09 16:12:18 +00:00
55db933812
Merge branch 'use-correct-script-location' into 'master'
...
Use the correct script location for the build trigger script
See merge request gitlab-org/gitlab-ce!20454
2018-07-09 16:09:23 +00:00
780af30f2a
Merge branch 'upgrade-hamlit-for-ruby25' into 'master'
...
Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045
Closes #42045
See merge request gitlab-org/gitlab-ce!20315
2018-07-09 16:04:37 +00:00
fc607521f2
Merge branch 'fix-search-bar' into 'master'
...
Fix search bar text input alignment
Closes #48288
See merge request gitlab-org/gitlab-ce!20155
2018-07-09 16:04:22 +00:00
5e8ff175d5
Fix search bar text input alignment
2018-07-09 16:04:22 +00:00
e2f7fbe439
Merge branch 'rails5-fix-48977' into 'master'
...
Rails5 fix mysql milliseconds problem in specs
Closes #48977
See merge request gitlab-org/gitlab-ce!20464
2018-07-09 16:02:56 +00:00
4bb26e7dad
Merge branch 'rails5-update-gemfile-lock' into 'master'
...
Update Gemfile.rails5.lock with latest Gemfile.lock changes
See merge request gitlab-org/gitlab-ce!20466
2018-07-09 16:00:39 +00:00
b7b2836324
Merge branch '48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-rendered' into 'master'
...
Resolve "Markdown help incorrect in how wiki pages are rendered"
Closes #48970
See merge request gitlab-org/gitlab-ce!20459
2018-07-09 15:45:48 +00:00
21a511e47e
Merge branch 'docs-clarify-pages-domain' into 'master'
...
Docs: make it clear that you need a completely separate domain for Pages
Closes #31961
See merge request gitlab-org/gitlab-ce!20369
2018-07-09 15:17:10 +00:00
47f5dab692
Docs: make it clear that you need a completely separate domain for Pages
2018-07-09 15:17:10 +00:00
e8d7b283be
Merge branch 'jprovazn-upload-symlink' into 'master'
...
Add FileUploader.root to allowed upload paths
Closes gitlab-qa#291
See merge request gitlab-org/gitlab-ce!20472
2018-07-09 15:07:26 +00:00
d8013704b6
Document that we don't want to wait in tests
2018-07-09 14:53:33 +00:00
2b4509c4a4
Merge branch 'DustinU/fix/sign-in-button-text-48917' into 'master'
...
Show "Sign in" instead of "Sign in / Register" when sign up is disabled
See merge request gitlab-org/gitlab-ce!20474
2018-07-09 14:49:33 +00:00
1da22cec12
Show "Sign in" instead of "Sign in / Register" when sign up is disabled
2018-07-09 14:49:33 +00:00
8186bb3903
Removes unused store in diffs mr refactor
...
Removes double export for actions in diffs module in mr refactor
2018-07-09 15:46:36 +01:00
9a9b4444ac
Merge branch 'sh-fix-issue-47797-ce' into 'master'
...
Fix handling of annotated tags when Gitaly is not in use
Closes #47797
See merge request gitlab-org/gitlab-ce!20497
2018-07-09 14:46:17 +00:00
e45dcbdca2
Merge branch '48960-namespace-diff-module' into 'master'
...
Resolve "Use namespaped module for diffs"
Closes #48960
See merge request gitlab-org/gitlab-ce!20442
2018-07-09 14:26:26 +00:00
31f2608161
Fix handling of annotated tags when Gitaly is not in use
...
Attempting to view an annotated tag in the TreeController would result
in `NoMethodError: undefined method 'tree'` when Rugged was in use.
`Blob#find_by_rugged` assumes that the ref is a true. Using
the commit ID ensures that the right ref is being used.
Note that in 11.1, `Blob#find` no longer uses Rugged, so this is only
a bug in 11.0.
Closes gitlab-org/gitlab-ce#47797
2018-07-09 06:30:19 -07:00
72c99b58ab
Remove useless return
2018-07-09 21:13:08 +08:00
5cd7b8033a
Use latest gitlab-styles
2018-07-09 21:13:08 +08:00
3bfe306624
Resolve Naming/UncommunicativeMethod
2018-07-09 21:13:08 +08:00
9286f5b934
Use stable gitlab-styles and eliminate offenses
2018-07-09 21:13:08 +08:00
4ee08b77bc
Updates from rubocop -a
2018-07-09 21:13:08 +08:00
612f5e63b3
Update rubocop to get rid of a warning in other MR
2018-07-09 21:12:31 +08:00
acdac151f5
Merge branch 'docs/kubernetes-tiller' into 'master'
...
Add note about the k8s namespace of installed applications
See merge request gitlab-org/gitlab-ce!20423
2018-07-09 12:58:09 +00:00
f2db1e3142
Merge branch 'docs-update-version-for-variables' into 'master'
...
updates version for CI_JOB_URL and CI_PIPELINE_URL to 11.1
See merge request gitlab-org/gitlab-ce!20450
2018-07-09 12:57:15 +00:00
eed8e8ff70
Call correct action in spec
2018-07-09 13:19:26 +01:00
1070558d55
Merge branch 'master' into 48960-namespace-diff-module
...
* master:
Resolve "MR refactor: Performance costs of main element with `v-if`"
Add documentation on private projects
Make blob and other RPC's mandatory
Removed return statements from prettier script
Add missing strings to `locale/gitlab.pot`
Update `gettext:updated_check` regenerate pot file
Include wget in apk add command
[Rails5] Fix 'Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace'
Updated color
Update doc on new option to add README when creating a project
Make more things mandatory
Updated (color of indent guide in Web IDE
Make all Gitaly diff flags mandatory
2018-07-09 13:15:29 +01:00
67157de1e4
Merge branch '48898-mr-refactor-performance-costs-of-main-element-with-v-if' into 'master'
...
Resolve "MR refactor: Performance costs of main element with `v-if`"
Closes #48898
See merge request gitlab-org/gitlab-ce!20463
2018-07-09 11:54:15 +00:00
9eef6cd1bf
Resolve "MR refactor: Performance costs of main element with v-if"
2018-07-09 11:54:15 +00:00
8dfa7a429e
Merge branch '48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace' into 'master'
...
Resolve "[Rails5] Invalid single-table inheritance type: Group is not a subclass of Gitlab::BackgroundMigration::FixCrossProjectLabelLinks::Namespace"
Closes #48976
See merge request gitlab-org/gitlab-ce!20462
2018-07-09 11:17:46 +00:00
6b2ebea7dc
Added test and used Array() instead of .wrap
2018-07-09 13:06:12 +02:00
d4301731ec
Merge branch 'docs/add-private-projects-public-access-note' into 'master'
...
Add documentation on private projects
Closes #48955
See merge request gitlab-org/gitlab-ce!20446
2018-07-09 10:48:18 +00:00
