summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix throttling issue in form dirty checking61928-remove-throttle-from-dirty-submitNathan Friend2019-05-173-31/+97
* Merge branch 'sh-bump-gitlab-shell-9.2.0' into 'master'Douglas Barbosa Alexandre2019-05-161-1/+1
|\
| * Upgrade gitlab-shell to 9.2.0Stan Hu2019-05-161-1/+1
* | Merge branch 'haml-lint-fe' into 'master'Douglas Barbosa Alexandre2019-05-161-0/+2
|\ \ | |/ |/|
| * Add haml-lint.yml to FE for roulettehaml-lint-feLuke Bennett2019-05-131-0/+2
* | 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 'docs-render_if_exists-opts-caveat' into 'master'Phil Hughes2019-05-161-1/+13
|\ \ \ \
| * | | | Explain render_if_exists opts caveatdocs-render_if_exists-opts-caveatLuke Bennett2019-05-161-1/+13
* | | | | Merge branch 'docs-what-to-do-if-review-jobs-keep-failing' into 'master'Sean McGivern2019-05-161-6/+16
|\ \ \ \ \
| * | | | | Document what to do if review jobs keep failingRémy Coutable2019-05-161-6/+16
* | | | | | Merge branch 'ce-2087-make-num-shards-configurable' into 'master'Sean McGivern2019-05-163-1/+15
|\ \ \ \ \ \
| * | | | | | CE backport of "Configure the number of ES shards and replicas"Nick Thomas2019-05-163-1/+15
* | | | | | | Merge branch 'jc-omit-count-diverging-commits-max' into 'master'Lin Jen-Shin2019-05-164-4/+63
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Omit max-count for diverging_commit_counts behind feature flagjc-omit-count-diverging-commits-maxJohn Cai2019-05-144-4/+63
* | | | | | | Merge branch 'diff-filter-bar-placeholder-text' into 'master'Filipa Lacerda2019-05-162-2/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Changed the placeholder text of the diff tree filter inputPhil Hughes2019-05-162-2/+9
* | | | | | | Merge branch 'disallow-review-deploy-to-fail' into 'master'Sean McGivern2019-05-161-3/+2
|\ \ \ \ \ \ \
| * | | | | | | Disallow the review-deploy and review-qa-smoke jobs to faildisallow-review-deploy-to-failRémy Coutable2019-05-151-3/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'reg-captcha-flag' into 'master'Nick Thomas2019-05-163-14/+33
|\ \ \ \ \ \ \
| * | | | | | | Add :registrations_recaptcha feature flagLuke Bennett2019-05-163-14/+33
* | | | | | | | Merge branch 'fix_failure_migrate_on_mysql8' into 'master'Stan Hu2019-05-162-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix. db:migrate is failed on MySQL 8sue4452019-05-162-1/+7
* | | | | | | | | Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master'Stan Hu2019-05-167-5/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix an error in projects admin when statistics are missingRémy Coutable2019-05-167-5/+64
* | | | | | | | | | Merge branch 'docs-render_if_exists-relative-path' into 'master'Phil Hughes2019-05-161-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Explain `render_if_exists` relative pathLuke Bennett2019-05-161-0/+10
* | | | | | | | | | | 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-163-20/+20
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Fix Style/NegatedUnless offenses in HAML filesh-update-rubocop-and-gitlab-styles-ceRémy Coutable2019-05-161-4/+4
| * | | | | | | | | | Update Rubocop to 0.69.0 and other gemsStan Hu2019-05-152-16/+16
* | | | | | | | | | | Merge branch '59838-blocks' into 'master'Phil Hughes2019-05-163-14/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixes stylelint issues for blocks.scss59838-blocksFilipa Lacerda2019-05-103-14/+8
* | | | | | | | | | | | Merge branch '19569-include-information-if-issue-was-closed-via-mr' into 'mas...Rémy Coutable2019-05-1611-22/+126
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Include MR information if possible when emailing notification of closing an i...Michał Zając2019-05-1611-22/+126
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'ce-11621-fix-broken-master' into 'master'Rémy Coutable2019-05-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix a broken spec for EEce-11621-fix-broken-masterNick Thomas2019-05-161-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'diff-whitespace-setting-changes' into 'master'Filipa Lacerda2019-05-164-6/+50
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixes issues with show whitespace button in diffsPhil Hughes2019-05-104-6/+50
* | | | | | | | | | | Merge branch 'acme-module' into 'master'Nick Thomas2019-05-1613-4/+337
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add Let's Encrypt clientVladimir Shushlin2019-05-1613-4/+337
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'sh-fix-rebase-error-clearing' into 'master'Nick Thomas2019-05-163-2/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearingStan Hu2019-05-153-2/+33
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'js-i18n-i' into 'master'Filipa Lacerda2019-05-165-9/+31
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | I18N JS files starting with ijs-i18n-iBrandon Labuschagne2019-05-075-9/+31
* | | | | | | | | | | 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
| | |_|_|_|/ / / / / / | |/| | | | | | | | |