summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fixing request json mime typeFrancisco Javier López2018-01-151-0/+10
* Merge branch 'sh-log-when-user-blocked' into 'master'Douwe Maan2018-01-152-0/+66
|\
| * Log and send a system hook if a blocked user fails to loginsh-log-when-user-blockedStan Hu2018-01-142-0/+66
* | Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'Grzegorz Bizon2018-01-153-45/+80
|\ \ | |/ |/|
| * Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitalyAhmad Sherif2018-01-113-45/+80
* | Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' ...Annabel Dunstone Gray2018-01-123-22/+20
|\ \
| * | update capybara specs for subscription toggleMike Greiling2018-01-122-16/+14
| * | update karma testsMike Greiling2018-01-121-6/+6
* | | Display related merge requests in commit detail pageHiroyuki Sato2018-01-124-0/+128
* | | Merge remote-tracking branch 'upstream/master' into 41731-predicate-memoizationLin Jen-Shin2018-01-135-13/+123
|\ \ \
| * \ \ Merge branch '41807-15665-consistently-502s-because-it-fetches-every-commit' ...41988-updating-the-markdown-cache-version-does-not-flush-the-appearances-cacheRémy Coutable2018-01-122-3/+80
| |\ \ \
| | * | | Only search for MR revert commits on notes after MR was merged41807-15665-consistently-502s-because-it-fetches-every-commitSean McGivern2018-01-122-3/+80
| * | | | Merge branch '41937-vue-prop-type' into 'master'Phil Hughes2018-01-121-8/+26
| |\ \ \ \
| | * | | | Fix boolean prop being provided as string41937-vue-prop-typeFilipa Lacerda2018-01-111-8/+26
| | | |/ / | | |/| |
| * | | | Merge branch '41956-fix-ctrl-enter-binding-to-save-comment' into 'master'Phil Hughes2018-01-122-2/+17
| |\ \ \ \
| | * | | | Fix Ctrl+Enter keyboard shortcut saving comment/note edit41956-fix-ctrl-enter-binding-to-save-commentEric Eastwood2018-01-112-2/+17
* | | | | | Make sure it's not offending to use local ||= valLin Jen-Shin2018-01-131-0/+14
* | | | | | Introduce PredicateMemoization cop and fix offensesLin Jen-Shin2018-01-121-0/+86
|/ / / / /
* | | | | Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'Douwe Maan2018-01-121-13/+35
|\ \ \ \ \
| * | | | | Ensure that emails contain absolute, rather than relative, links to user uploadsNick Thomas2018-01-111-13/+35
* | | | | | Merge branch 'mk-fix-permanent-redirect-validation' into 'master'Douwe Maan2018-01-122-0/+75
|\ \ \ \ \ \
| * | | | | | Add RedirectRoute factoryMichael Kozono2018-01-112-3/+18
| * | | | | | Fix Rubocop offenseMichael Kozono2018-01-111-1/+1
| * | | | | | Revert "Revert "Fix Route validation for unchanged path""Michael Kozono2018-01-111-0/+60
* | | | | | | Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'Robert Speicher2018-01-111-23/+29
|\ \ \ \ \ \ \
| * | | | | | | Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitalyAhmad Sherif2018-01-101-23/+29
* | | | | | | | Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'Robert Speicher2018-01-111-37/+57
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitalyAhmad Sherif2018-01-101-37/+57
| |/ / / / / /
* | | | | | | Merge branch 'main-js-tidy-up' into 'master'Filipa Lacerda2018-01-1125-10/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Tidy up main JS filemain-js-tidy-upPhil Hughes2018-01-1025-10/+22
| |/ / / / /
* | | | | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-1115-0/+427
* | | | | | Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-1117-59/+78
|\ \ \ \ \ \
| * | | | | | Added tests for removing soft removed objectsremove-soft-removalsYorick Peterse2018-01-101-0/+77
| * | | | | | Remove soft removals related codeYorick Peterse2018-01-0816-59/+1
* | | | | | | Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'Rémy Coutable2018-01-111-28/+38
|\ \ \ \ \ \ \
| * | | | | | | Migrate merged_branch_names to GitalyAhmad Sherif2018-01-111-28/+38
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'option-disable-archive-cache' into 'master'Sean McGivern2018-01-111-0/+14
|\ \ \ \ \ \ \
| * | | | | | | Add option to disable git archive caching in workhorseoption-disable-archive-cacheJacob Vosmaer2018-01-091-0/+14
* | | | | | | | Merge branch '41608-clipboard-vue-button' into 'master'Phil Hughes2018-01-111-0/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds props to allow tooltip config. Breaks tests into specific cases41608-clipboard-vue-buttonFilipa Lacerda2018-01-111-1/+7
| * | | | | | | | Add tooltip missing to clipboard componentFilipa Lacerda2018-01-101-0/+25
* | | | | | | | | Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master'Rémy Coutable2018-01-111-0/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Hide new branch and tag links for projects with an empty repoMark Fletcher2018-01-091-0/+39
* | | | | | | | | | Merge branch 'fix-use-of-append-in-mr-api-spec' into 'master'Grzegorz Bizon2018-01-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Remove call to ProjectTeam#<< in MR API specSean McGivern2018-01-111-1/+1
* | | | | | | | | | Merge branch '38068-commits-count' into 'master'Yorick Peterse2018-01-115-0/+68
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Denormalize commits count for merge request diffs38068-commits-countJan Provaznik2018-01-105-0/+68
* | | | | | | | | | Merge branch '41613-fix-redundant-modal' into 'master'Filipa Lacerda2018-01-112-45/+61
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update tests to cover modal dialogKushal Pandya2018-01-111-12/+54
| * | | | | | | | | | Update tests for modal changesKushal Pandya2018-01-111-33/+7
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
View Lorry Controller Status