summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Resolve CE/EE diffs in protected branchesprotected-branches-scbLuke Bennett2019-05-161-1/+1
* Merge branch '59838-blocks' into 'master'Phil Hughes2019-05-163-14/+8
|\
| * Fixes stylelint issues for blocks.scss59838-blocksFilipa Lacerda2019-05-103-14/+8
* | Include MR information if possible when emailing notification of closing an i...Michał Zając2019-05-168-17/+43
* | Merge branch 'diff-whitespace-setting-changes' into 'master'Filipa Lacerda2019-05-162-5/+16
|\ \
| * | Fixes issues with show whitespace button in diffsPhil Hughes2019-05-102-5/+16
* | | Add Let's Encrypt clientVladimir Shushlin2019-05-162-3/+9
* | | Merge branch 'sh-fix-rebase-error-clearing' into 'master'Nick Thomas2019-05-161-2/+2
|\ \ \
| * | | Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearingStan Hu2019-05-151-2/+2
* | | | Merge branch 'js-i18n-i' into 'master'Filipa Lacerda2019-05-164-9/+16
|\ \ \ \
| * | | | I18N JS files starting with ijs-i18n-iBrandon Labuschagne2019-05-074-9/+16
* | | | | Merge branch 'help-scb' into 'master'Phil Hughes2019-05-161-2/+1
|\ \ \ \ \
| * | | | | Resolve CE/EE diffs in help/indexhelp-scbLuke Bennett2019-05-151-2/+1
* | | | | | Merge branch 'signup-box-scb' into 'master'Phil Hughes2019-05-161-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Resolve CE/EE diffs in signup_boxsignup-box-scbLuke Bennett2019-05-151-0/+1
| |/ / / /
* | | | | Merge branch 'js-i18n-n' into 'master'Kushal Pandya2019-05-162-15/+30
|\ \ \ \ \
| * | | | | Add missing sprintf and remove bad i18njs-i18n-nBrandon Labuschagne2019-05-152-11/+12
| * | | | | Refactor split link after i18nBrandon Labuschagne2019-05-151-6/+13
| * | | | | I18N JS files starting with nBrandon Labuschagne2019-05-153-22/+29
* | | | | | Merge branch 'ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-ap...Kushal Pandya2019-05-162-1/+5
|\ \ \ \ \ \
| * | | | | | Fix flyout nav on small viewportsce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-sizeLuke Bennett2019-05-152-1/+5
* | | | | | | Merge branch 'jej/list-sessions-for-user' into 'master'Stan Hu2019-05-161-11/+38
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Sessions can be listed for a given userjej/list-sessions-for-userJames Edwards-Jones2019-05-151-11/+38
* | | | | | | Merge branch 'js-i18n-m' into 'master'60916-list-vanilla-js-i18n-offences-which-were-not-auto-fixedKushal Pandya2019-05-155-13/+18
|\ \ \ \ \ \ \
| * | | | | | | I18N JS files starting with mjs-i18n-mBrandon Labuschagne2019-05-035-13/+18
* | | | | | | | Merge branch 'ce-jej/sso-enforcement-redirect' into 'master'Rémy Coutable2019-05-156-21/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid passing not_found_or_authorized_proc aroundJames Edwards-Jones2019-05-156-21/+18
| * | | | | | | | Refactor RoutableActions to allow for additional checksJames Edwards-Jones2019-05-151-3/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'new-proj-member-scb' into 'master'Phil Hughes2019-05-152-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Resolve CE/EE diffs in new proj member importnew-proj-member-scbLuke Bennett2019-05-102-1/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | 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-1515-4/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Resolve CE/EE diffs in app/views/layouts viewlayouts-scbLuke Bennett2019-05-1115-4/+40
| |/ / / / / / / /
* | | | | | | | | 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-152-5/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve CE/EE diffs in zero_authorized_projectszero-auth-proj-scbLuke Bennett2019-05-112-5/+14
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | 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