summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-14177-1081/+3756
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Skip creating the merge request if repo is emptyLin Jen-Shin2017-08-111-0/+2
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-1163-98/+107
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Just use repository would fix the testLin Jen-Shin2017-08-111-4/+1
| * | | | | | | | | | | | | Since now fetch_ref is reliable, we could just rely on itLin Jen-Shin2017-08-111-5/+5
| * | | | | | | | | | | | | Just use the repo. Not sure why master could passLin Jen-Shin2017-08-111-2/+2
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-11187-802/+1399
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix more testsLin Jen-Shin2017-08-117-119/+120
| * | | | | | | | | | | | | | Don't try to create diffs if one of the branch is missingLin Jen-Shin2017-08-106-20/+18
| * | | | | | | | | | | | | | Try to show exception information in the testLin Jen-Shin2017-08-101-1/+9
| * | | | | | | | | | | | | | Introduce MergeRequest#write_ref and Repository#write_refLin Jen-Shin2017-08-106-24/+39
| * | | | | | | | | | | | | | Avoid ambiguity, which happened in a single test runLin Jen-Shin2017-08-101-1/+1
| * | | | | | | | | | | | | | Just detect exit status rather than check refLin Jen-Shin2017-08-101-1/+1
| * | | | | | | | | | | | | | Fix some tests and report the error messageLin Jen-Shin2017-08-098-12/+29
| * | | | | | | | | | | | | | Fake out Repository#fetch_ref for merge request ifLin Jen-Shin2017-08-092-3/+12
| * | | | | | | | | | | | | | Detect if we didn't create the ref soonerLin Jen-Shin2017-08-092-1/+25
* | | | | | | | | | | | | | | Merge branch 'mk-enforce-boolean-defaults' into 'master'Douwe Maan2017-08-149-0/+186
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Exclude existing offensesMichael Kozono2017-08-146-0/+6
| * | | | | | | | | | | | | | Add SaferBooleanColumn copMichael Kozono2017-08-143-0/+180
* | | | | | | | | | | | | | | Merge branch 'gitaly-404-commit-list-files' into 'master'Douwe Maan2017-08-143-23/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Migrate Git::Repository.ls_files to Gitalygitaly-404-commit-list-filesKim "BKC" Carlbäcker2017-08-103-23/+49
* | | | | | | | | | | | | | | | Merge branch 'zj-patch-rails-template' into 'master'36421-clarify-git_data_dirs-documentationDouwe Maan2017-08-141-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update rails tempalte to not contain gitlab-testZeger-Jan van de Weg2017-08-141-0/+0
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'pagination-projects-explore' into 'master'Douwe Maan2017-08-148-10/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-148-10/+78
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'revert-3c2cff0c' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert "Merge branch 'zj-fix-charlock_holmes' into 'master'"revert-3c2cff0cMarin Jankovski2017-08-141-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-143-11/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | reset original directory in ensureAlexis Reigel2017-08-141-8/+4
| * | | | | | | | | | | | | | add changelogAlexis Reigel2017-08-141-0/+4
| * | | | | | | | | | | | | | use mutex for keychain interactionAlexis Reigel2017-08-142-8/+56
| * | | | | | | | | | | | | | store gpg return directory locallyAlexis Reigel2017-08-112-5/+31
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fly-out-tunnel' into 'master'Filipa Lacerda2017-08-143-69/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | moved timeout to a variablefly-out-tunnelPhil Hughes2017-08-141-4/+8
| * | | | | | | | | | | | | fixed up specs caused by left over elements in the bodyPhil Hughes2017-08-142-4/+5
| * | | | | | | | | | | | | fixed JS error when no sidebar existsPhil Hughes2017-08-141-0/+3
| * | | | | | | | | | | | | Add dynamic navigation tunnel to fly-out menusPhil Hughes2017-08-143-69/+247
* | | | | | | | | | | | | | Update CHANGELOG.md for 9.4.5James Edwards-Jones2017-08-1419-73/+21
* | | | | | | | | | | | | | Merge branch 'zj-fix-charlock_holmes' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update charlock_holmeszj-fix-charlock_holmesZeger-Jan van de Weg2017-08-141-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '36133-project-overview-page-doesn-t-load-commit-metadata-for-re...Tim Zallmann2017-08-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into '36133-project-overview-page-doesn-t-load-commit-m...36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-viewMike Greiling2017-08-10218-778/+1763
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fix commit metadata in project:show pageMike Greiling2017-08-081-0/+3
* | | | | | | | | | | | | | | | Merge branch 'user-edit-files-spec-fix' into 'master'Tim Zallmann2017-08-141-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Wait for requests to finish before running the ace JSuser-edit-files-spec-fixPhil Hughes2017-08-091-0/+17
* | | | | | | | | | | | | | | | Merge branch '36325-increase-z-index-pipeline-dropdown' into 'master'Phil Hughes2017-08-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Increase z-index of pipeline dropdown36325-increase-z-index-pipeline-dropdownAnnabel Dunstone Gray2017-08-111-0/+1
* | | | | | | | | | | | | | | | Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-1425-524/+251
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-114-4/+184
| * | | | | | | | | | | | | | | | Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-118-22/+22