summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump fog-aws to 3.3.0 and associated dependenciessh-bump-fog-gemStan Hu2019-01-243-30/+31
* Merge branch 'if-log_user_admin_status' into 'master'Stan Hu2019-01-241-1/+1
|\
| * Log admin status of user when OAuth::User is savedImre Farkas2019-01-231-1/+1
* | Merge branch 'patch-40' into 'master'Evan Read2019-01-241-2/+2
|\ \
| * | Update repository_mirroring.mdRobert Devitt2019-01-231-2/+2
* | | Merge branch 'docs-push-mirror-GitLab-GitHub' into 'master'Evan Read2019-01-242-3/+11
|\ \ \
| * | | Amended with suggestions by @ereadJoseph Yu2019-01-231-5/+4
| * | | Added changelogJoseph Yu2019-01-221-0/+5
| * | | Updated fields information for push mirror from GitLab to GitHubJoseph Yu2019-01-221-3/+7
* | | | Merge branch 'fix-loose-typo' into 'master'Nick Thomas2019-01-243-4/+4
|\ \ \ \
| * | | | Revert changes to *.po filesMax Raab2019-01-2337-74/+74
| * | | | Fix 'loose' typoMax Raab2019-01-1140-78/+78
* | | | | Merge branch 'sh-fix-upload-snippets-with-relative-url-root' into 'master'Nick Thomas2019-01-243-0/+61
|\ \ \ \ \
| * | | | | Fix 404s for snippet uploads when relative URL root usedStan Hu2019-01-223-0/+61
| | |_|/ / | |/| | |
* | | | | Merge branch 'sh-remove-bitbucket-mirror-constant' into 'master'Robert Speicher2019-01-233-6/+20
|\ \ \ \ \
| * | | | | Fix import handling errors in Bitbucket Server importerStan Hu2019-01-183-6/+20
* | | | | | Merge branch 'custom-gitaly-url' into 'master'Stan Hu2019-01-232-1/+25
|\ \ \ \ \ \
| * | | | | | Allow Gitaly to be built from a custom URLNick Thomas2019-01-232-1/+25
* | | | | | | Merge branch 'sh-fix-issue-9357' into 'master'Douglas Barbosa Alexandre2019-01-233-1/+17
|\ \ \ \ \ \ \
| * | | | | | | Fix 500 errors with legacy appearance logosStan Hu2019-01-233-1/+17
* | | | | | | | Merge branch '52674-api-v4-projects-project_id-jobs-endpoint-hits-statement-t...Nick Thomas2019-01-235-18/+150
|\ \ \ \ \ \ \ \
| * | | | | | | | [API] Omit X-Total{,-Pages} when count > 10kRémy Coutable2019-01-225-18/+150
* | | | | | | | | Merge branch '56514-docs-feedback-add-git-clone-to-list-of-basic-git-commands...Marcia Ramos2019-01-231-0/+48
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add brief description, fix typo, comply with docs style guideMarcia Ramos2019-01-231-8/+10
| * | | | | | | | Address Feedback from Docs TeamAndrew Fontaine2019-01-231-6/+38
| * | | | | | | | Add `git clone` to List of Basic Git CommandsAndrew Fontaine2019-01-171-0/+14
* | | | | | | | | Merge branch 'improve-review-apps-docs' into 'master'Rémy Coutable2019-01-232-35/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve Review Apps documentationRémy Coutable2019-01-232-35/+76
* | | | | | | | | | Merge branch 'qa-staging-27' into 'master'Mark Lapierre2019-01-234-4/+134
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [QA] Use public_email instead of email since it's availableRémy Coutable2019-01-234-4/+134
* | | | | | | | | | | Merge branch 'docs/fix-broken-link' into 'master'Marcia Ramos2019-01-231-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix broken docs linkAchilleas Pipinellis2019-01-231-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix/55956-oversized-dropdown-button-custom-notifications' into ...Phil Hughes2019-01-232-2/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Added `btn_class` to the dropdown for custom notificationsEzekiel Kigbo2019-01-232-2/+7
|/ / / / / / / / /
* | | | | | | | | Merge branch 'gt-externalize-app-views-sent_notifications' into 'master'Filipa Lacerda2019-01-233-7/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Externalize strings from `/app/views/sent_notifications`George Tsiolis2019-01-233-7/+17
* | | | | | | | | | Merge branch '56417-update-helm-to-2-12-2' into 'master'Kamil Trzciński2019-01-234-3/+8
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update Helm to 2.12.2 to address Helm client vulnerability56417-update-helm-to-2-12-2-ado-testTakuya Noguchi2019-01-184-3/+8
* | | | | | | | | | Merge branch '56731-wait_for_job_to_be_done-gitlab-assets-compile-fails-in-th...Lin Jen-Shin2019-01-231-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Set API_TOKEN in the review-build-cng job56731-wait_for_job_to_be_done-gitlab-assets-compile-fails-in-the-review-build-cng-jobRémy Coutable2019-01-231-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-b...Filipa Lacerda2019-01-2320-63/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-2220-63/+65
* | | | | | | | | | | Merge branch 'docs-slack-troubleshooting' into 'master'Drew Blessing2019-01-231-1/+51
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Switch to Rails console scriptCody West2019-01-221-17/+12
| * | | | | | | | | | Add script explanationCody West2019-01-221-0/+7
| * | | | | | | | | | Add link to production logCody West2019-01-221-2/+2
| * | | | | | | | | | Fix sidekiq log linkCody West2019-01-221-1/+1
| * | | | | | | | | | Fix typos and wordingCody West2019-01-141-6/+13
| * | | | | | | | | | Add troubleshooting sectionCody West2019-01-111-1/+42
* | | | | | | | | | | Merge branch 'dm-trim-discussion-truncated-line-first-chars' into 'master'Phil Hughes2019-01-238-24/+40
|\ \ \ \ \ \ \ \ \ \ \