summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary bind callremove-unnecessary-bind-in-gettextMark Florian2019-05-171-1/+1
* Merge branch 'admin-user-access-levels-scb' into 'master'Phil Hughes2019-05-161-0/+2
|\
| * Resolve CE/EE diffs in admin user access levelsadmin-user-access-levels-scbLuke Bennett2019-05-161-0/+2
* | Merge branch 'mirror-repos-scb' into 'master'Phil Hughes2019-05-161-1/+1
|\ \
| * | Resolve CE/EE diffs in mirror repos settingsmirror-repos-scbLuke Bennett2019-05-161-1/+1
* | | Merge branch 'jc-omit-count-diverging-commits-max' into 'master'Lin Jen-Shin2019-05-161-1/+22
|\ \ \
| * | | Omit max-count for diverging_commit_counts behind feature flagjc-omit-count-diverging-commits-maxJohn Cai2019-05-141-1/+22
* | | | Merge branch 'diff-filter-bar-placeholder-text' into 'master'Filipa Lacerda2019-05-161-1/+8
|\ \ \ \
| * | | | Changed the placeholder text of the diff tree filter inputPhil Hughes2019-05-161-1/+8
* | | | | Merge branch 'reg-captcha-flag' into 'master'Nick Thomas2019-05-161-9/+16
|\ \ \ \ \
| * | | | | Add :registrations_recaptcha feature flagLuke Bennett2019-05-161-9/+16
* | | | | | Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master'Stan Hu2019-05-163-5/+7
|\ \ \ \ \ \
| * | | | | | Fix an error in projects admin when statistics are missingRémy Coutable2019-05-163-5/+7
* | | | | | | Merge branch 'flash-messages-scb' into 'master'Phil Hughes2019-05-161-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Resolve CE/EE diffs in _flash_messagesflash-messages-scbLuke Bennett2019-05-161-0/+1
* | | | | | | Merge branch 'sh-update-rubocop-and-gitlab-styles-ce' into 'master'Rémy Coutable2019-05-161-4/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix Style/NegatedUnless offenses in HAML filesh-update-rubocop-and-gitlab-styles-ceRémy Coutable2019-05-161-4/+4
* | | | | | | 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
| |/ / / / / / / / / /