Commit graph

13 commits

Author SHA1 Message Date
Lin Jen-Shin
5174d6c146 Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project
* upstream/master: (337 commits)
  Update CHANGELOG for !4659
  Center the header logo for all Devise emails
  Add previews for all customized Devise emails
  Customize the Devise `unlock_instructions` email
  Customize the Devise `reset_password_instructions` email
  Customize the Devise `password_change` emails
  Use gitlab-git 10.2.0
  Use Git cached counters on project show page
  Fix indentation scss-lint errors
  Added title attribute to enties in tree view Closes #18353
  Banzai::Filter::ExternalLinkFilter use XPath
  Reduce queries in IssueReferenceFilter
  Use gitlab_git 10.1.4
  Fixed ordering in Project.find_with_namespace
  Fix images in emails
  Banzai::Filter::UploadLinkFilter use XPath
  Turn Group#owners into a has_many association
  Make project_id nullable
  CHANGELOG [ci skip]
  CHANGELOG [ci skip]
  ...
2016-06-17 19:52:55 +08:00
Mark Pundsack
db656a3987 Fix more references to old gitlab-runner 2016-06-13 22:06:13 -07:00
Lin Jen-Shin
d936c32ed9 Tweak the wordings and grammar slightly 2016-06-09 16:29:10 +08:00
Lin Jen-Shin
4d277b9c74 Updated doc description according to feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12345562
2016-06-09 16:06:02 +08:00
Lin Jen-Shin
9e14ebe6bc Update CHANGELOG and doc for locked runner feature 2016-06-09 16:00:24 +08:00
Lin Jen-Shin
7fa80a79cd Fixed a typo (remove extra n) 2016-06-09 16:00:24 +08:00
Grzegorz Bizon
bf9cc351c2 Add minor corrections related to config of runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon
b253aa32c7 Add docs for a new configuration setting for runner 2016-05-19 22:01:53 +02:00
Grzegorz Bizon
fd13cd189f Merge branch 'docs/notice-about-gitlab-runner' into 'master'
Add notice about GitLab Runner to requirements docs

This is related to #14589, and problems that may stem from running
GitLab Runner on same machine user installed GitLab web app on.

See merge request !3518
2016-04-19 12:17:48 +00:00
Jamie Neubert Pedersen
b49069b72c change: "very demand" changed to "specific demand"
This must be an error as the sentence doesn't make sense otherwise
2016-04-14 16:04:18 +00:00
Achilleas Pipinellis
d86190eead Add a note about installing Runners in ci/runners/README.md 2016-04-11 12:41:27 +03:00
Luke Waite
e6dbbafd0a Update docs for shared runner default settings
Fixes #5993
2016-01-10 08:29:50 -05:00
Douwe Maan
046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00