summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix remaining calls to GitLab QA factoriesqa/gb/gitlab-qa-factoriesGrzegorz Bizon2017-12-154-6/+4
* Rename QA scenarios to make factory concept explicitGrzegorz Bizon2017-12-1512-191/+195
* Merge branch 'backport-ee-3706' into 'master'Dmitriy Zaporozhets2017-12-151-0/+4
|\
| * Add eager-load paths to autoload paths to fix Rake tasksNick Thomas2017-12-141-0/+4
* | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-1511-1/+93
|\ \
| * | moved lfs_blob_ids method into ExtractsPath modulelfs-badgePhil Hughes2017-12-143-8/+6
| * | spec fixesPhil Hughes2017-12-143-4/+4
| * | moved lfs blob fetch from extractspath filePhil Hughes2017-12-145-6/+11
| * | added specsPhil Hughes2017-12-122-0/+68
| * | fixed failing testsPhil Hughes2017-12-112-0/+2
| * | fixed project homepage not having correct variablePhil Hughes2017-12-112-1/+3
| * | Added LFS badge to indicate LFS tracked filesPhil Hughes2017-12-115-0/+17
* | | Merge branch 'trigger-user-pipeline-info' into 'master'Grzegorz Bizon2017-12-151-4/+11
|\ \ \
| * | | Make rubocop happyBalasankar "Balu" C2017-12-151-1/+1
| * | | Use guard clauseBalasankar "Balu" C2017-12-151-3/+1
| * | | Improve languageBalasankar "Balu" C2017-12-151-4/+6
| * | | PrettifyBalasankar "Balu" C2017-12-151-4/+9
| * | | Use temp branchBalasankar "Balu" C2017-12-151-1/+1
| * | | Pass info about who started the job and which job triggered itBalasankar "Balu" C2017-12-151-1/+3
|/ / /
* | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-149-10/+30
|\ \ \
| * | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-139-10/+30
* | | | Merge branch 'docs-add-indexes-monitoring' into 'master'Achilleas Pipinellis2017-12-146-82/+96
|\ \ \ \
| * | | | Docs: add indexes for monitoring and performance monitoringMarcia Ramos2017-12-146-82/+96
|/ / / /
* | | | Merge branch 'clearer-documentation-on-inline-diffs' into 'master'Achilleas Pipinellis2017-12-142-3/+25
|\ \ \ \
| * | | | clearer-documentation-on-inline-diffsDimitrie Hoekstra2017-12-142-3/+25
|/ / / /
* | | | Merge branch 'docs/commit-diff-discussions-in-mr-context' into 'master'Achilleas Pipinellis2017-12-144-0/+47
|\ \ \ \
| * | | | Add docs for commit diff discussion in merge requestsmicael.bergeron2017-12-144-0/+47
* | | | | Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-144-20/+32
|\ \ \ \ \
| * | | | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-144-20/+32
* | | | | | Merge branch 'ph-es-modules' into 'master'Filipa Lacerda2017-12-1410-121/+67
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-1410-121/+67
* | | | | | Merge branch 'docs-jprovazn-create-from-email' into 'master'Marcia Ramos2017-12-143-5/+12
|\ \ \ \ \ \
| * | | | | | Fixed doc for create MR from emaildocs-jprovazn-create-from-emailJan Provaznik2017-12-123-5/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-142-3/+14
|\ \ \ \ \ \
| * | | | | | Clear BatchLoader after each spec to prevent holding onto records longer than...dm-batchloader-projectDouwe Maan2017-12-141-0/+5
| * | | | | | Include project in BatchLoader key to prevent returning blobs for the wrong p...Douwe Maan2017-12-141-3/+9
| | |/ / / / | |/| | | |
* | | | | | Merge branch '40509_sorting_tags_api' into 'master'Rémy Coutable2017-12-146-5/+65
|\ \ \ \ \ \
| * | | | | | sorting for tags apihaseeb2017-12-146-5/+65
|/ / / / / /
* | | | | | Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-143-14/+25
|\ \ \ \ \ \
| * | | | | | Clear caches before updating MR diffsZeger-Jan van de Weg2017-12-143-14/+25
* | | | | | | Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-143-10/+7
|\ \ \ \ \ \ \
| * | | | | | | Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manualShinya Maeda2017-12-143-10/+7
* | | | | | | | Merge branch 'qa/gb/update-qa-dependencies' into 'master'Grzegorz Bizon2017-12-143-52/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | Use new Ruby version 2.4 in GitLab QA imagesGrzegorz Bizon2017-12-141-1/+1
| * | | | | | | | Update GitLab QA dependenciesGrzegorz Bizon2017-12-142-51/+45
* | | | | | | | | Merge branch 'gitlab-shell-5-10-3' into 'master'Grzegorz Bizon2017-12-141-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Bump gitlab-shell version to 5.10.3Sean McGivern2017-12-141-1/+1
* | | | | | | | | Merge branch 'tc-correct-email-in-reply-to' into 'master'Sean McGivern2017-12-146-7/+96
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make discussion mail References all notes in the discussiontc-correct-email-in-reply-toToon Claes2017-12-134-19/+57
| * | | | | | | | | Make mail notifications of discussion notes In-Reply-To of each otherToon Claes2017-12-135-5/+56