summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor how a few ActiveRecord enums are definedrefactor-enums-for-eeYorick Peterse2018-11-157-34/+82
* Merge branch '54021-empty-button' into 'master'Phil Hughes2018-11-153-1/+7
|\
| * Prevents empty button in jobs empty state54021-empty-buttonFilipa Lacerda2018-11-143-1/+7
* | Merge branch 'sh-remove-local-sidekiq-admin-check' into 'master'Nick Thomas2018-11-153-43/+5
|\ \
| * | Remove display of local Sidekiq process in /admin/sidekiqStan Hu2018-11-153-43/+5
* | | Merge branch 'use-parallel-ci-keyword' into 'master'Kamil Trzciński2018-11-154-133/+24
|\ \ \ | |/ / |/| |
| * | Use the new parallel keyword in .gitlab-ci.ymluse-parallel-ci-keywordRémy Coutable2018-11-154-133/+24
* | | Merge branch 'fix-typos' into 'master'Phil Hughes2018-11-153-3/+3
|\ \ \ | |/ / |/| |
| * | Fix types commentyukihir02018-11-153-3/+3
* | | Merge branch '53626-update-config-map-on-install-retry' into 'master'Kamil Trzciński2018-11-153-8/+36
|\ \ \
| * | | Update config map if already present on install53626-update-config-map-on-install-retryThong Kuah2018-11-153-8/+36
* | | | Merge branch 'remove-rails5-gemfile' into 'master'Robert Speicher2018-11-151-7/+0
|\ \ \ \
| * | | | Remove Gemfile.rails5Jan Provaznik2018-11-151-7/+0
* | | | | Merge branch 'triggermesh-phase2-serverless' into 'master'Kamil Trzciński2018-11-155-1/+38
|\ \ \ \ \
| * | | | | Add knative client to kubeclient libraryChris Baumbauer2018-11-155-1/+38
|/ / / / /
* | | | | Merge branch 'ignore-environment-validation-failure' into 'master'Kamil Trzciński2018-11-154-0/+78
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ignore environment validation failureShinya Maeda2018-11-154-0/+78
|/ / / /
* | | | Merge branch 'osw-remove-comment-on-any-diff-line-ff' into 'master'Douwe Maan2018-11-152-28/+1
|\ \ \ \
| * | | | Remove 'comment_on_any_diff_line' feature flagosw-remove-comment-on-any-diff-line-ffOswaldo Ferreira2018-11-142-28/+1
| |/ / /
* | | | Merge branch 'osw-fallback-on-blank-refs' into 'master'Grzegorz Bizon2018-11-153-1/+28
|\ \ \ \
| * | | | Avoid Gitaly RPC errors when fetching diff statsosw-fallback-on-blank-refsOswaldo Ferreira2018-11-143-1/+28
* | | | | Merge branch 'auto_devops_kubernetes_active' into 'master'Grzegorz Bizon2018-11-152-10/+21
|\ \ \ \ \
| * | | | | Use except:variables to fix multiple variable jobsauto_devops_kubernetes_activeThong Kuah2018-11-091-20/+16
| * | | | | Switch kubernetes:active with checking $KUBECONFIGThong Kuah2018-11-092-10/+25
* | | | | | Merge branch '53491-fix-again' into 'master'Sean McGivern2018-11-151-2/+2
|\ \ \ \ \ \
| * | | | | | Don't care about order when getting awarded issuesToon Claes2018-11-151-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix-typo-in-admin-intergration' into 'master'Sean McGivern2018-11-1530-30/+30
|\ \ \ \ \ \
| * | | | | | Fix a typo in Admin: intergration -> integrationfix-typo-in-admin-intergrationVincent AUBERT2018-11-1430-30/+30
* | | | | | | Merge branch 'sh-structured-logs-docs' into 'master'Sean McGivern2018-11-152-0/+145
|\ \ \ \ \ \ \
| * | | | | | | Add missing space to logging docsh-structured-logs-docsStan Hu2018-11-141-1/+1
| * | | | | | | Exclude qa and docs from Rails 4 buildsStan Hu2018-11-141-0/+2
| * | | | | | | Add documentation on how to use structured loggingStan Hu2018-11-142-0/+145
* | | | | | | | Merge branch 'doc-pc-shortcut-webide' into 'master'Achilleas Pipinellis2018-11-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Shortcuts documentation: Add the PC equivalent of the Mac's "Cmd" key in the ...Thomas Pathier2018-11-141-1/+1
* | | | | | | | | Merge branch 'leipert-master-patch-67614' into 'master'Stan Hu2018-11-151-3/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update to new security report syntaxleipert-master-patch-67614Lukas Eipert2018-11-141-3/+6
* | | | | | | | | | Merge branch 'notes-consistent-key-object-case' into 'master'Filipa Lacerda2018-11-1540-695/+676
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Made diff & note data consistentPhil Hughes2018-11-1440-695/+676
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '53882-extra-container-diff-version' into 'master'Fatih Acet2018-11-141-2/+25
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Tweak vertical line to line up with system notes and comment avatars53882-extra-container-diff-versionAnnabel Dunstone Gray2018-11-141-1/+1
| * | | | | | | | | Add back margin on discussion system notesAnnabel Dunstone Gray2018-11-141-1/+1
| * | | | | | | | | Remove box on diff tab system noteAnnabel Dunstone Gray2018-11-141-0/+17
| * | | | | | | | | Fix version system noteAnnabel Dunstone Gray2018-11-141-1/+7
* | | | | | | | | | Merge branch 'sh-exclude-rails4-builds-from-docs' into 'master'Douglas Barbosa Alexandre2018-11-141-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Exclude qa and docs from Rails 4 buildsStan Hu2018-11-141-0/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dm-commit-email-select-options' into 'master'Stan Hu2018-11-143-3/+13
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix bug causing not all emails to show up in commit email selectboxDouwe Maan2018-11-143-3/+13
| |/ / / / / / /
* | | | | | | | Merge branch '53918-snippet-commit-comments' into 'master'Fatih Acet2018-11-142-4/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix styling of snippet and commit discussion comments53918-snippet-commit-commentsAnnabel Dunstone Gray2018-11-142-4/+24
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'discussion-fixes-2' into 'master'Fatih Acet2018-11-142-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |