home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,797 Commits 48 Branches 340 Tags
cdcbc8d7219a669c016aaba89a1d47faebdd2208
Commit Graph
694 Commits
Author SHA1 Message Date
Lin Jen-Shin aeb24ee872 Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project 
* upstream/master: (353 commits)
  Put some admin settings in dropdown
  Add styleguide on configuration settings documentation
  Remove Duplicated keys add UNIQUE index to fingerprint
  Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
  Move appearance settings as sub tab to application settings
  use rails root join
  fixed a couple of errors spotted in production
  Fix RangeError exceptions when referring to issues or merge requests outside of max database values
  Fix bug in `WikiLinkFilter`.
  Grammar and typographic changes to artifacts documentation
  Tweak grammar
  Small frontend code fixes and restore 8a2d88f commit
  Warn about admin privilege to disable GitHub Webhooks
  Listing GH Webhooks doesn't stop import process for non GH admin users
  fixup! updated docs for api endpoint award emoji
  Update CHANGELOG
  Ensure Todos counters doesn't count Todos for projects pending delete
  Add endpoints for award emoji on notes
  Sort API endpoints and implement feedback
  Add endpoints for Award Emoji
  ...
 2016-06-20 14:04:14 +00:00
Dmitriy Zaporozhets 3f12e8d1b2 Put some admin settings in dropdown 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-20 14:55:20 +03:00
Dmitriy Zaporozhets 73d431731f Move appearance settings as sub tab to application settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-06-20 12:43:40 +03:00
Lin Jen-Shin 045dad3cf1 Test for enabling/disabling runners from admin runner page 2016-06-17 22:17:20 +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
Annabel Dunstone 6d10d8251c Rearrange order of tabs 2016-06-15 09:54:38 -05:00
Annabel Dunstone f1245bde89 Nest li elements directly under ul 2016-06-15 09:11:17 -05:00
Annabel Dunstone d3b6c18526 Move builds tab to admin overview 2016-06-15 09:10:16 -05:00
Annabel Dunstone d1c3f3d872 Add monitoring link with subtabs 2016-06-15 09:10:16 -05:00
Annabel Dunstone 922a164d60 Add sub links to overview 2016-06-15 09:10:16 -05:00
Rémy Coutable d26f81239a Add request access for groups 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-14 13:07:26 +02:00
Sean McGivern 40b6d9064a Allow custom text on 'almost there' page 
Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Tweak the styles for that page so that centered lists look reasonable.
 2016-06-08 19:08:53 +01:00
Kamil Trzcinski 9614c52266 Fix tests offenses: use pipeline of Ci::Build and rename views 2016-06-06 11:19:54 +02:00
Douwe Maan 2d084dd848 Merge branch 'separate-banzai-references' into 'master' 
Separate reference gathering from rendering

This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.

cc @rspeicher @DouweM 

See merge request !3969
 2016-06-01 15:51:59 +00:00
Kamil Trzcinski 846d111f1d Add Application Setting to configure Container Registry token expire delay (default 5min) 2016-05-31 13:23:13 +02:00
Yorick Peterse 25c08d11bb Added author to various Markdown calls in views 
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
 2016-05-26 17:14:06 +02:00
Annabel Dunstone 65925e6998 Remove top block from builds page 2016-05-24 12:31:46 -05:00
Grzegorz Bizon 2aa5707194 Extend runner config options for untagged jobs 2016-05-19 22:01:53 +02:00
Felipe Artur 7bb84e6497 Change landing page when skipping confirmation email and add documentation 2016-05-16 14:56:32 -03:00
Felipe Artur c5526a2d9a Change skip_user_confirmation_email to send_user_confirmation_email 2016-05-16 14:56:32 -03:00
Felipe Artur 71ca2de7aa Toggle email signup confirmation in admin settings 2016-05-16 14:56:32 -03:00
Drew Blessing 4fea5cda0b Fix minor typos in admin health check page 2016-05-12 17:11:37 -05:00
Robert Speicher 5186f6e3bd Merge branch 'default-scope-on-builds-page' into 'master' 
Fix a description for default scope on builds

Should be "**All* builds (from this project)" for the {project,admin}
builds page without scope.

Fix a regression on !2243 (#4240).

See merge request !4118
 2016-05-12 22:01:40 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route' 
# Conflicts:
#	db/schema.rb
 2016-05-12 16:39:03 -05:00
Douwe Maan 74c69709dc Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' 2016-05-12 15:11:37 -05:00
Takuya Noguchi 18fdbf0a03 Fix a description for default scope on builds 2016-05-13 01:28:55 +09:00
DJ Mountney ad77ab0376 Add Changelog entry 
and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
 2016-05-12 09:04:04 -07:00
Rémy Coutable 66824e09e2 Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' 
Reuse runners edit form in admin and project area

Reuse runners edit form in admin and project area.

![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png)

See merge request !4094
 2016-05-12 15:25:56 +00:00
Andrei Gliga 260c88a758 no need to define the help block since there's no help block 2016-05-12 13:44:46 +03:00
Andrei Gliga 6cdce04937 Revert "Revert "no need to show the help about Github or the other authentication sources"" 
This reverts commit 075ace5686c63d40f7e9fa02bf37e1bd3168f7e7.
 2016-05-12 13:44:46 +03:00
Andrei Gliga 9079b56bf4 Revert "no need to show the help about Github or the other authentication sources" 
This reverts commit 78a832d0fd7ff445c707809134dbb2a42d2a9e03.

Show help only for the enabled OAuth Providers on oauth-providers-help block

aria: { describedby: help_block_id } instead of 'aria-describedby' => help_block_id

provider and not p

a more simple approach to the OmniAuth helper links for oauth-providers-help
 2016-05-12 13:44:46 +03:00
Andrei Gliga 6bd8d3ad48 inline btn-group{ data: { toggle: 'buttons' } } 2016-05-12 13:44:46 +03:00
Andrei Gliga 25ff3fd5bd button_based_providers.any? instead of !button_based_providers.empty? 2016-05-12 13:44:46 +03:00
Andrei Gliga 7818f7329a On Application Settings Page let the user select the enabled OAuth Sign in sources instead of the disabled ones 2016-05-12 13:44:46 +03:00
Andrei Gliga a2d4c349b5 unindent 1 level the Disable OAuth form 2016-05-12 13:44:46 +03:00
Andrei Gliga dad501a236 no need to show the help about Github or the other authentication sources 2016-05-12 13:44:46 +03:00
Andrei Gliga 3c3bc93747 if omniauth is enabled and if there are button_based_providers available show the disable OAuth sources 2016-05-12 13:44:46 +03:00
Andrei Gliga 7c7c5b7e40 text for the disable_oauth_signin_sources label 2016-05-12 13:44:46 +03:00
Andrei Gliga cf30044314 OAuth Providers disable from the ApplicationSettings page 2016-05-12 13:44:46 +03:00
DJ Mountney c8f23bd2ed Support token header for health check token, and general cleanup of the health_check feature. 2016-05-11 17:27:08 -07:00
DJ Mountney 0e0caf4d17 Add tests for the health check feature 2016-05-10 16:19:16 -07:00
DJ Mountney 160ef66d1b Add health_check access token, and enforce on the health_check endpoint 
Also added a health check page to the admin section for resetting the token.
 2016-05-10 08:46:02 -07:00
Grzegorz Bizon 732e98eee7 Reuse runners edit form in admin and project area 2016-05-10 14:21:01 +02:00
Grzegorz Bizon bbc94e15a3 Use abbrevation in runners table in admin area 2016-05-10 13:07:14 +02:00
Grzegorz Bizon 607996c664 Remove broken inline runner description edit form 2016-05-09 13:56:15 +02:00
Annabel Dunstone 3a3f0bf436 Change build icons into buttons; update tests 2016-05-04 16:45:37 -05:00
Annabel Dunstone fc20639c8d Builds page redesign 2016-05-04 16:45:37 -05:00
Annabel Dunstone 7878eb9fa6 Start builds redesign 2016-05-04 16:45:37 -05:00
Gabriel Mazetto 00ced598ea Added UI to define secret_token for webhook and systemhook 
Codestyle changes to easy EE merge
 2016-05-02 10:32:01 -03:00
Arinde EniolaandJacob Schatz 826857f47b disable spellcheck and autocorrect for username field in admin page 2016-04-20 19:27:17 -04:00