summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prettify changed files44267-improve-failed-jobs-tabAndré Luís2018-06-011-8/+4
* Improve Failed Jobs tab in Pipeline detailAndré Luís2018-06-014-11/+82
* Merge branch 'gitaly-tripswitch' into 'master'Douwe Maan2018-06-0115-68/+226
|\
| * Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)2018-06-0115-68/+226
|/
* Merge branch '46481-preserve-warnings-even-if-passed' into 'master'Douwe Maan2018-06-0110-35/+47
|\
| * Follow Rubocop for scripts/prune-old-flaky-specsLin Jen-Shin2018-06-011-2/+3
| * Introduce Gitlab::Auth.omniauth_setup_providersLin Jen-Shin2018-06-012-9/+18
| * Eliminate constants warnings by:Lin Jen-Shin2018-06-019-22/+24
| * Preserve warnings even if it passedLin Jen-Shin2018-06-011-10/+10
* | Merge branch 'update-preferences-header' into 'master'Douwe Maan2018-06-011-1/+1
|\ \
| * | Externalize user preferences stringAndreas Kämmerle2018-05-311-1/+1
| * | Remove 'GitLab' from user preferences headerAndreas Kämmerle2018-05-311-1/+1
| |/
* | Merge branch 'fj-45059-add-validation-to-webhook' into 'master'Douwe Maan2018-06-0141-204/+286
|\ \
| * | Add validation to webhook and service URLs to ensure they are not blocked bec...Francisco Javier López2018-06-0141-204/+286
|/ /
* | Merge branch '46019-add-missing-migration' into 'master'Yorick Peterse2018-06-012-0/+24
|\ \
| * | Add CHANGELOG entry46019-add-missing-migrationTomasz Maczukin2018-05-221-0/+5
| * | Add missing migration for minimal Project build_timeoutTomasz Maczukin2018-05-221-0/+19
* | | Merge branch 'docs-fix-typo-pages-ce' into 'master'Achilleas Pipinellis2018-06-011-1/+1
|\ \ \
| * | | Merge branch 'docs-fix-typo-pages' into 'master'Achilleas Pipinellis2018-06-011-1/+1
|/ / /
* | | Merge branch 'docs/ldap' into 'master'Achilleas Pipinellis2018-06-011-120/+197
|\ \ \
| * | | Refactor LDAP docsAchilleas Pipinellis2018-06-011-120/+197
|/ / /
* | | Merge branch 'add-moneky-patch-for-using-stream-upload-with-carrierwave' into...Kamil Trzciński2018-06-012-0/+74
|\ \ \
| * | | Revise commentsadd-moneky-patch-for-using-stream-upload-with-carrierwaveShinya Maeda2018-05-281-3/+2
| * | | Clean up patchShinya Maeda2018-05-281-9/+31
| * | | Fix rubocop namespaceShinya Maeda2018-05-281-5/+5
| * | | Reload remote file the cacheds file is already removedShinya Maeda2018-05-281-0/+3
| * | | Use prepend to correctly use the monketpatch's methodShinya Maeda2018-05-281-24/+28
| * | | Add changelogShinya Maeda2018-05-281-0/+5
| * | | Fix static analysisShinya Maeda2018-05-281-5/+5
| * | | Add a monkey pach of https://github.com/carrierwaveuploader/carrierwave/pull/...Shinya Maeda2018-05-281-0/+41
* | | | Merge branch '46840-fix-merge-request-unmergeable-email-plural' into 'master'Sean McGivern2018-06-013-3/+3
|\ \ \ \
| * | | | Fix merge request unmergeable notification email plural interpolation46840-fix-merge-request-unmergeable-email-pluralMark Chao2018-05-313-3/+3
* | | | | Merge branch 'ide-jobs-list-components' into 'master'Filipa Lacerda2018-06-0144-547/+1571
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into ide-jobs-list-componentside-jobs-list-componentsPhil Hughes2018-05-31109-1167/+1278
| |\ \ \ \ \
| * | | | | | fixed jobs getting overwritten incorrectlyPhil Hughes2018-05-301-1/+1
| * | | | | | fixed mutations specPhil Hughes2018-05-301-6/+4
| * | | | | | changed mutation to return new arrayPhil Hughes2018-05-305-49/+81
| * | | | | | changed mutations, update single object instead of returning new arrayPhil Hughes2018-05-306-47/+52
| * | | | | | Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-30158-486/+1721
| |\ \ \ \ \ \
| * | | | | | | fixed failing specsPhil Hughes2018-05-302-3/+4
| * | | | | | | removed style from components & moved to repo.scssPhil Hughes2018-05-295-92/+98
| * | | | | | | more store testsPhil Hughes2018-05-293-3/+195
| * | | | | | | Merge branch 'master' into ide-jobs-list-componentsPhil Hughes2018-05-29165-1590/+3629
| |\ \ \ \ \ \ \
| * | | | | | | | karma fixesPhil Hughes2018-05-292-4/+6
| * | | | | | | | added component specsPhil Hughes2018-05-2910-39/+360
| * | | | | | | | added correct help path to empty statePhil Hughes2018-05-296-4/+18
| * | | | | | | | added empty state & YAML error statePhil Hughes2018-05-2910-18/+88
| * | | | | | | | fixed height of header changing when expanding/collapsingPhil Hughes2018-05-251-0/+1
| * | | | | | | | fixed scrolling issuesPhil Hughes2018-05-251-3/+18
| * | | | | | | | fixed up after bootstrap upgradePhil Hughes2018-05-255-17/+27
View Lorry Controller Status