summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Edit comments in CI templateedit-ci-template-fileEvan Read2019-05-151-41/+50
* Merge branch 'patch-34' into 'master'Evan Read2019-05-151-3/+0
|\
| * recursive/nested includes supported nowBen Bodenmiller2019-05-061-3/+0
* | Merge branch 'patch-54' into 'master'Evan Read2019-05-151-2/+7
|\ \
| * | upgrate example ymal file, change type to stage.mouson2019-05-021-2/+7
* | | Merge branch 'docs-component-cleanup' into 'master'Achilleas Pipinellis2019-05-151-41/+43
|\ \ \
| * | | docs: improve architecture component detailsBen Bodenmiller2019-05-151-41/+43
|/ / /
* | | Merge branch 'docs-update-group-template-pricing-tier' into 'master'Evan Read2019-05-151-1/+1
|\ \ \
| * | | Update group project templates to premium/silverdocs-update-group-template-pricing-tierTristan Williams2019-05-141-1/+1
* | | | Merge branch 'docs-correct-security-anchor-ee' into 'master'Achilleas Pipinellis2019-05-152-3/+3
|\ \ \ \
| * | | | Update links to new security docsdocs-correct-security-anchor-eeMark Chao2019-05-132-3/+3
* | | | | Merge branch 'patch-57' into 'master'Achilleas Pipinellis2019-05-151-3/+2
|\ \ \ \ \
| * | | | | docs: use sudo on gitlab-rake gitlab:features:*Ben Bodenmiller2019-05-151-3/+2
|/ / / / /
* | | | | Merge branch 'patch-58' into 'master'Evan Read2019-05-151-1/+1
|\ \ \ \ \
| * | | | | fix a typo of sastQuantum Operations2019-05-141-1/+1
* | | | | | Merge branch 'elasticsearch-pathfix-docs' into 'master'Achilleas Pipinellis2019-05-151-1/+1
|\ \ \ \ \ \
| * | | | | | Fix ES indexer install script - remove leading /elasticsearch-pathfix-docsGreg Myers2019-05-101-1/+1
* | | | | | | Merge branch 'patch-58' into 'master'Evan Read2019-05-151-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in index.mdJonas Gollenz2019-05-141-1/+1
* | | | | | | | Merge branch 'patch-55' into 'master'Achilleas Pipinellis2019-05-151-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed the unnecessary line. It would be covered anyway by line 352 (replica...bardia zamanian2019-05-091-1/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'rjh/doc-fixes-for-source-install' into 'master'Evan Read2019-05-152-9/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Rjh/doc fixes for source installRichard Hancock2019-05-152-9/+9
|/ / / / / / / /
* | | | | | | | Merge branch 'doc-jej/session-stored-globaly' into 'master'Evan Read2019-05-152-0/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | Document ways of accessing Session data in GitLabdoc-jej/session-stored-globalyJames Edwards-Jones2019-05-152-0/+66
* | | | | | | | | Merge branch 'js-i18n-m' into 'master'60916-list-vanilla-js-i18n-offences-which-were-not-auto-fixedKushal Pandya2019-05-156-13/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | I18N JS files starting with mjs-i18n-mBrandon Labuschagne2019-05-036-13/+33
* | | | | | | | | | Merge branch 'ce-jej/sso-enforcement-redirect' into 'master'Rémy Coutable2019-05-158-22/+181
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Avoid passing not_found_or_authorized_proc aroundJames Edwards-Jones2019-05-158-22/+56
| * | | | | | | | | | Refactor RoutableActions to allow for additional checksJames Edwards-Jones2019-05-151-3/+9
| * | | | | | | | | | Added RoutableActions testsJames Edwards-Jones2019-05-151-0/+119
* | | | | | | | | | | Merge branch 'new-proj-member-scb' into 'master'Phil Hughes2019-05-153-1/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Resolve CE/EE diffs in new proj member importnew-proj-member-scbLuke Bennett2019-05-103-1/+26
* | | | | | | | | | | | Merge branch 'proj-branches-index-scb' into 'master'Phil Hughes2019-05-151-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Resolve CE/EE diffs in project branchesproj-branches-index-scbLuke Bennett2019-05-111-0/+3
* | | | | | | | | | | | | Merge branch 'layouts-scb' into 'master'Phil Hughes2019-05-1516-4/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Resolve CE/EE diffs in app/views/layouts viewlayouts-scbLuke Bennett2019-05-1116-4/+52
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'health-check-scb' into 'master'Phil Hughes2019-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Resolve CE/EE diffs in health checkhealth-check-scbLuke Bennett2019-05-111-1/+1
* | | | | | | | | | | | | | Merge branch '57239-remove-unused-h3-w3-classes' into 'master'Phil Hughes2019-05-151-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove unused h-3 and w-3 classes57239-remove-unused-h3-w3-classesPaul Slaughter2019-05-131-4/+0
* | | | | | | | | | | | | | | Merge branch 'clone-panel-scb' into 'master'Phil Hughes2019-05-151-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Resolve CE/EE diffs in _clone_panelclone-panel-scbLuke Bennett2019-05-141-0/+5
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'zero-auth-proj-scb' into 'master'Phil Hughes2019-05-153-5/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Resolve CE/EE diffs in zero_authorized_projectszero-auth-proj-scbLuke Bennett2019-05-113-5/+20
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'tabs-ldap-scb' into 'master'Phil Hughes2019-05-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Resolve CE/EE diffs in devise ldap tabstabs-ldap-scbLuke Bennett2019-05-101-0/+1
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'next-badge-link' into 'master'Kushal Pandya2019-05-152-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove trailing whitespace for lintnext-badge-linkMarcel van Remmerden2019-05-131-1/+1
| * | | | | | | | | | | | | | Finish rebase processMarcel van Remmerden2019-05-131-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \