summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WIP: fix cert newline issues with tiller by base64 encoding29398-add-mutual-tls-to-tiller-for-gitlab-managed-appsDylan Griffith2018-06-154-12/+12
* WIP: almost working tiller server client TLSDylan Griffith2018-06-146-13/+46
* WIP: Generate ssl keys and certs for helmDylan Griffith2018-06-121-0/+95
* Add extra columns for Helm Tiller client authDylan Griffith2018-06-122-1/+21
* Merge branch 'remove-favicon-blue.ico' into 'master'Douwe Maan2018-06-121-0/+0
|\
| * We already moved to png and this is no longer usedremove-favicon-blue.icoLin Jen-Shin2018-06-121-0/+0
* | Merge branch 'patch-28' into 'master'Douwe Maan2018-06-121-1/+1
|\ \
| * | Fix typo in doc/development/README.mdDennis Tang2018-06-121-1/+1
* | | Merge branch 'jr-6382-lfs-import-docs' into 'master'Douwe Maan2018-06-121-0/+0
|\ \ \
| * | | Update import screenshot without LFS warningjr-6382-lfs-import-docsJames Ramsay2018-06-111-0/+0
* | | | Merge branch 'bvl-fix-maintainer-push-rejected' into 'master'Douwe Maan2018-06-124-4/+36
|\ \ \ \
| * | | | Fixes rejected pushes from maintainersbvl-fix-maintainer-push-rejectedBob Van Landuyt2018-06-114-4/+36
* | | | | Merge branch 'docs-coached-20180608-1' into 'master'Achilleas Pipinellis2018-06-121-13/+45
|\ \ \ \ \
| * | | | | fixed/enhanced command-line documentationEdwin Torres2018-06-121-13/+45
|/ / / / /
* | | | | Merge branch 'blackst0ne-update-gemfile-rails5-lock' into 'master'Rémy Coutable2018-06-121-19/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [Rails5] Update Gitlab.rails5.lockblackst0ne-update-gemfile-rails5-lockblackst0ne2018-06-121-19/+19
|/ / / /
* | | | Merge branch 'fix-input-placeholder-color' into 'master'Annabel Gray2018-06-121-1/+1
|\ \ \ \
| * | | | Fix input placeholder text colorfix-input-placeholder-colorAndreas Kämmerle2018-06-111-1/+1
* | | | | Merge branch '47687-milestone-and-labels-dropdowns-are-misplaced-with-collaps...Annabel Gray2018-06-122-4/+4
|\ \ \ \ \
| * | | | | Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar"47687-milestone-and-labels-dropdowns-are-misplaced-with-collapsed-sidebarClement Ho2018-06-112-4/+4
* | | | | | Merge branch 'jivl-fix-import-gitlab-project-page' into 'master'Annabel Gray2018-06-111-1/+1
|\ \ \ \ \ \
| * | | | | | fix styling of the gitlab import pageJose2018-06-111-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '47245-hr-avatar' into 'master'Clement Ho2018-06-111-0/+4
|\ \ \ \ \ \
| * | | | | | Hide overflow on hrAnnabel Dunstone Gray2018-06-111-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '47604-avatars-and-system-icons-for-mobile' into 'master'Clement Ho2018-06-112-2/+7
|\ \ \ \ \ \
| * | | | | | Make avatars/icons hidden on mobileTakuya Noguchi2018-06-082-2/+7
* | | | | | | Merge branch '47522-revert-mr-modal' into 'master'Annabel Gray2018-06-112-11/+11
|\ \ \ \ \ \ \
| * | | | | | | Remove .row and .col-sm-12Clement Ho2018-06-111-9/+8
| * | | | | | | Fix styling of revert MR modaltauriedavis2018-06-082-4/+5
* | | | | | | | Merge branch 'jivl-fix-collapse-sidebar-button-color' into 'master'Clement Ho2018-06-111-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix collapse sidebar button colorJose2018-06-111-0/+8
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '47338-sign-in-btn' into 'master'Clement Ho2018-06-114-11/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix alignment of sign in/sign up buttonAnnabel Dunstone Gray2018-06-084-11/+7
* | | | | | | | Merge branch 'correct-gray-600' into 'master'Annabel Gray2018-06-111-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update theme-gray-600 and gl-text-color-tertiaryAndreas Kämmerle2018-06-111-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jivl-fix-merge-request-contribution-aligment' into 'master'Annabel Gray2018-06-111-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix contribution section aligmentJose2018-06-081-3/+3
* | | | | | | | Merge branch '47479-add-ssh-key-message-is-hard-to-read' into 'master'Annabel Gray2018-06-111-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Removes the border-radius from the alertssamdbeckham2018-06-111-0/+1
| * | | | | | | | Sets the colors and link colors in alerts/noticessamdbeckham2018-06-111-7/+9
| * | | | | | | | Adds the white color back to the alret bannerssamdbeckham2018-06-081-1/+6
* | | | | | | | | Merge branch 'jivl-fix-padding-commit-info' into 'master'Annabel Gray2018-06-112-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix padding in commit infoJose2018-06-112-1/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-relax-project-import-spec' into 'master'Mayra Cabrera2018-06-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Relax expectation in spec/models/project_spec.rbStan Hu2018-06-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sh-github-importer-improve-error' into 'master'James Lopez2018-06-111-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | GitHub Rake importer: Fail with a clearer explanation if GitLab username is w...Stan Hu2018-06-111-1/+4
* | | | | | | | | | Merge branch '46708-page-numbers' into 'master'Clement Ho2018-06-112-0/+24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Override BS4 pagination variablesAnnabel Dunstone Gray2018-06-082-0/+24
* | | | | | | | | | | Merge branch 'unify-uploaders-objects_storage.rb' into 'master'Robert Speicher2018-06-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \