summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update to note actions done by gitlab.com adminskristmcg-master-patch-44621Kristie McGoldrick2019-05-151-0/+3
* 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Resolve merge conflictMarcel van Remmerden2019-05-071-3/+4
| | * | | | | | | | Change sizes from px to variablesMarcel van Remmerden2019-05-071-4/+4
| | * | | | | | | | Refactor badge with link layoutMarcel van Remmerden2019-05-072-22/+18
| | * | | | | | | | Adapt code to style guidelinesMarcel van Remmerden2019-05-072-9/+9
| | * | | | | | | | Remove trailing whitespacesMarcel van Remmerden2019-05-071-4/+3
| | * | | | | | | | Remove whitespaceMarcel van Remmerden2019-05-071-2/+2
| | * | | | | | | | Fix new linesMarcel van Remmerden2019-05-071-1/+7
| | * | | | | | | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-072-2/+18
| * | | | | | | | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-131-3/+4
* | | | | | | | | | Merge branch 'bvl-add-corrilation-id-to-all-exception' into 'master'Douglas Barbosa Alexandre2019-05-143-10/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add correlation id to all sentry errorsBob Van Landuyt2019-05-133-10/+15
* | | | | | | | | | | Merge branch 'patch-56' into 'master'Evan Read2019-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix typoNicholas Bishop2019-05-141-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'53811-move-multiple-issue-boards-for-projects-to-coreStan Hu2019-05-1410-7/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Optimise upload path callsSean McGivern2019-05-1410-7/+23
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-slow-preview-note-specs' into 'master'Sean McGivern2019-05-141-6/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix hiding of quick action prompt in specsfix-slow-preview-note-specsHeinrich Lee Yu2019-05-141-6/+4
* | | | | | | | | | | Merge branch 'patch-58' into 'master'Stan Hu2019-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | delete feature flag when disabling RuggedBen Bodenmiller2019-05-131-1/+1
* | | | | | | | | | | | Merge branch 'single-codebase-favicon-specs-ce' into 'master'Rémy Coutable2019-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \