Commit graph

12 commits

Author SHA1 Message Date
Rémy Coutable
434ad2b927 Merge branch 'runners-paginate' into 'master'
Fixes error 500 on Runners page (`ActionView::Template::Error (Missing partial kaminari/_paginator`)

Originally reported downstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903

See merge request !5701
2016-10-21 14:58:26 +00:00
Achilleas Pipinellis
edbbbe3a27 Fix grammar and typos in Runners pages
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-28 10:03:59 +02:00
Libor Klepáč
24538ec090 Fix error 500 on Runners page.
~~~~
ActionView::Template::Error (Missing partial kaminari/_paginator
~~~~

Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=819903

Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-08-08 16:28:57 +10:00
Lin Jen-Shin
08070c7695 Merge remote-tracking branch 'upstream/master' into enable-shared-runners-with-admins
* upstream/master: (120 commits)
  Update CHANGELOG for 8.9.4, 8.8.7, and 8.7.9.
  Remove additional entries from CHANGELOG
  Catch permission denied errors and ignore the disk
  Remove coveralls lines
  Make GH one-off auth the default again for importing GH projects
  Import from Github using Personal Access Tokens.
  Remove hardcoded gitlab-shell version in test env now that the required tag is published
  Updated breakpoint for sidebar pinning
  Expire branch/tag git data when needed.
  Remove unnecessary parens
  Enable Style/UnneededCapitalW Rubocop cop
  Expiry date on pinned nav cookie
  Fix broken spec in git_push_service_spec by stubbing an external issue tracker
  Handle external issues in IssueReferenceFilter
  Move Changelog entry for build retry fix to 8.9.4
  Add Changelog entry for build sidebar retry link fix
  Improve method that tells if build is retryable
  Do not show build retry link when build is active
  Remove coveralls as its unused
  Move changelot item "Add sub nav to file page view" to 8.9.4
  ...
2016-07-01 17:34:00 +08:00
Lin Jen-Shin
59413153f5 Use warning for locked runners:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4961#note_12794221
2016-06-30 21:26:50 +08:00
Valery Sizov
13fc95acc4 Remove unnecessary parens 2016-06-30 16:01:26 +03:00
Lin Jen-Shin
397a69f834 Allow admins to assign locked runners:
And show information about locked status.

Help! This looks bad :o
2016-06-28 19:55:12 +08:00
Dmitriy Zaporozhets
fcf3b9d8d6
Move admin->runners tab as subnav of overview tab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-16 21:39:30 +03:00
Dmitriy Zaporozhets
f9fd003159
Fix missing paddings in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-04 19:41:31 +02:00
Grzegorz Bizon
3e6950481a Use method that creates runners registration token
`runners_registration_token` now creates a new token if it is blank.
2015-12-23 11:45:17 +01:00
Grzegorz Bizon
2ec93abed7 Merge branch 'master' into ci/persist-registration-token
* master: (66 commits)
  Fix runners admin view
  Fix migrations
  Rename mention of gitlab-git-http-server to gitlab-workhorse
  Bump Redis requirement to 2.8 for Sidekiq 4 requirements
  Fix wording on runner setup page
  add details on how to change saml button label
  Fix tests
  Move awards back to gray panel and few improvements to sidebar
  Few UI improvements to new sidebar implementation
  Fix tests for new issuable sidebar
  Update changelog
  Implement new sidebar for merge request page
  Make edit link on issuable sidebar works
  Redesign issue page for new sidebar
  Move awards css to separate file
  Implement issuable sidebar partial
  Update CHANGELOG
  Clarify cache behavior
  Run builds from projects with enabled CI
  Use Gitlab::Git instead of Ci::Git
  ...

Conflicts:
	db/schema.rb
2015-12-14 12:26:40 +01:00
Kamil Trzcinski
e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Renamed from app/views/ci/admin/runners/index.html.haml (Browse further)