summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix stylemk-fix-case-insensitive-redirect-matchingMichael Kozono2017-08-091-3/+3
* Fix conflicting redirect searchMichael Kozono2017-08-082-26/+60
* Merge branch '36168-fix-transient-preferences-specs' into 'master'Sean McGivern2017-08-081-12/+16
|\
| * Fix Profile > Preferences feature specs36168-fix-transient-preferences-specsRémy Coutable2017-08-081-12/+16
* | Merge branch '36169-fix-master' into 'master'Sean McGivern2017-08-081-13/+8
|\ \
| * | Fix a broken Events API spec36169-fix-masterRémy Coutable2017-08-081-13/+8
* | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-081-1/+1
|\ \ \
| * | | Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer2017-08-081-1/+1
* | | | Merge branch '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-...Rémy Coutable2017-08-082-0/+12
|\ \ \ \
| * | | | Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-082-0/+12
* | | | | Merge branch '35052-please-select-a-file-when-attempting-to-upload-or-replace...Filipa Lacerda2017-08-081-0/+42
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-081-0/+42
* | | | | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-086-52/+64
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-074-3/+20
| * | | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-073-13/+5
| * | | | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-074-36/+39
* | | | | Merge branch '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern2017-08-083-0/+97
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make sure that we have author and committerLin Jen-Shin2017-08-081-0/+3
| * | | | Add a test to show that threshold 40 would corrupt35098-raise-encoding-confidence-thresholdLin Jen-Shin2017-08-083-0/+94
* | | | | Merge branch 'rc/fix-commits-api' into 'master'Sean McGivern2017-08-088-157/+570
|\ \ \ \ \
| * | | | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref n...rc/fix-commits-apiRémy Coutable2017-08-088-157/+570
| |/ / / /
* | | | | Merge branch 'project-homepage-activity' into 'master'Tim Zallmann2017-08-081-0/+15
|\ \ \ \ \
| * | | | | Fixed activity not loading on project homepageproject-homepage-activityPhil Hughes2017-08-081-0/+15
* | | | | | Expose noteable_iid in Notesue4452017-08-081-0/+35
* | | | | | Merge branch 'rc/fix-tags-api' into 'master'Sean McGivern2017-08-084-160/+348
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name...Rémy Coutable2017-08-084-160/+348
| |/ / / /
* | | | | Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into 'mas...Rémy Coutable2017-08-082-17/+26
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Print the setup steps and duration and fix an issue resulting in re-setuping ...35941-fix-testing-issue-following-gitaly-install-fixRémy Coutable2017-08-042-8/+17
| * | | | Unset the RUBYOPT env variable before installing gitaly-rubyRémy Coutable2017-08-042-5/+10
| * | | | Revert "Merge branch 'fix-gitaly-install' into 'master'"Rémy Coutable2017-08-042-16/+11
* | | | | Merge branch 'master' into ideMike Greiling2017-08-0764-271/+1523
|\ \ \ \ \
| * | | | | Show all labelsRegis Boudinot2017-08-083-17/+21
| * | | | | Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-0811-20/+109
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-0711-20/+109
| * | | | | 33874 confidential issue redesignRegis Boudinot2017-08-074-0/+169
| * | | | | Resolve "User dropdown in filtered search does not load avatar on `master`"Tim Zallmann2017-08-071-1/+1
| * | | | | Merge branch 'feature/migrate-find-commits-by-message-to-gitaly' into 'master'Robert Speicher2017-08-071-9/+21
| |\ \ \ \ \
| | * | | | | Migrate Repository#find_commits_by_message to Gitalyfeature/migrate-find-commits-by-message-to-gitalyAhmad Sherif2017-08-071-9/+21
| | |/ / / /
| * | | | | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-075-10/+122
| |\ \ \ \ \
| | * | | | | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-075-10/+122
| * | | | | | Group-level new issue & MR using previously selected projectBryce Johnson2017-08-074-5/+125
| * | | | | | Merge branch '35761-convdev-perc' into 'master'Sean McGivern2017-08-075-4/+71
| |\ \ \ \ \ \
| | * | | | | | Store & use ConvDev percentages returned by Version app35761-convdev-percJarka Kadlecova2017-08-075-4/+71
| * | | | | | | Merge branch 'backport-ee-2251' into 'master'Sean McGivern2017-08-074-26/+160
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/25...Nick Thomas2017-08-074-26/+160
| * | | | | | | Merge branch 'blob-batch-methods' into 'master'Douwe Maan2017-08-071-0/+71
| |\ \ \ \ \ \ \
| | * | | | | | | Rename 'limit' to 'blob_size_limit'Jacob Vosmaer2017-08-071-5/+5
| | * | | | | | | Add Gitlab::Git::Blob.batch methodJacob Vosmaer2017-08-011-0/+71
| * | | | | | | | Merge branch '15664-remove-jquery-nicescroll' into 'master'Phil Hughes2017-08-073-6/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fix failing specs due phantomJS scroll positionMike Greiling2017-08-041-4/+4