summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '61657-allow-report-section-list-to-not-have-redundant-status-ic...Fatih Acet2019-05-173-1/+23
|\
| * Allow hiding of report status icon in report item61657-allow-report-section-list-to-not-have-redundant-status-iconSam Bigelow2019-05-093-1/+23
* | Merge branch 'js-i18n-g-files' into 'master'Fatih Acet2019-05-173-3/+5
|\ \
| * | I18N of JS files starting with gjs-i18n-g-filesBrandon Labuschagne2019-05-163-3/+5
* | | Style toasts according to design specsJacques Erasmus2019-05-172-2/+63
* | | Merge branch 'dz-patch-58' into 'master'Annabel Dunstone Gray2019-05-171-1/+1
|\ \ \
| * | | Prefer Noto Sans over Oxygen-Sansdz-patch-58Dmitriy Zaporozhets2019-05-161-1/+1
* | | | Merge branch '60379-remove-ci-preparing-state-feature-flag' into 'master'James Lopez2019-05-175-19/+2
|\ \ \ \
| * | | | Stop configuring group clusters on creation60379-remove-ci-preparing-state-feature-flagTiger2019-05-165-19/+2
* | | | | Merge branch 'group-general-settings-scb' into 'master'Phil Hughes2019-05-172-11/+11
|\ \ \ \ \
| * | | | | Resolve CE/EE diffs in group general settingsgroup-general-settings-scbLuke Bennett2019-05-162-11/+11
* | | | | | Merge branch 'admin-groups-form-scb' into 'master'Phil Hughes2019-05-171-1/+1
|\ \ \ \ \ \
| * | | | | | Resolve CE/EE diffs in admin groups formadmin-groups-form-scbLuke Bennett2019-05-161-1/+1
| |/ / / / /
* | | | | | Merge branch 'protected-branches-scb' into 'master'Phil Hughes2019-05-171-1/+1
|\ \ \ \ \ \
| * | | | | | Resolve CE/EE diffs in protected branchesprotected-branches-scbLuke Bennett2019-05-161-1/+1
* | | | | | | Merge branch '60550-make-application-data-plain-module' into 'master'Bob Van Landuyt2019-05-171-39/+35
|\ \ \ \ \ \ \
| * | | | | | | Make ApplicationData a plain module include60550-make-application-data-plain-moduleDylan Griffith2019-05-161-39/+35
| | |_|/ / / / | |/| | | | |
* | | | | | | Fix incorrect prefix used in new uploads for personal snippetsStan Hu2019-05-162-11/+69
|/ / / / / /
* | | | | | 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