summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* also skip read ability for new group / project membersbugfix.skip-ability-check-on-new-membershttp://jneen.net/2017-08-141-7/+10
* Merge branch '36385-pipeline-graph-dropdown' into 'master'Phil Hughes2017-08-142-0/+26
|\
| * Stops propagation for dropdown content in pipeline graph. Applies the same be...36385-pipeline-graph-dropdownFilipa Lacerda2017-08-142-0/+26
* | Merge branch '34527-make-edit-comment-button-always-available-outside-of-drop...Clement Ho2017-08-1414-78/+83
|\ \
| * | take edit note button out of dropdown34527-make-edit-comment-button-always-available-outside-of-dropdownSimon Knox2017-08-1014-78/+83
* | | Merge branch '7-days-cycle-analytics' into 'master'Rémy Coutable2017-08-144-1/+54
|\ \ \
| * | | Add a `Last 7 days` option for Cycle Analytics viewMehdi Lahmam2017-08-114-1/+30
| * | | Add feature specs for Cycle Analytics pipeline summaryMehdi Lahmam2017-08-111-0/+24
* | | | Merge branch 'rs-remove-username-from-sanitize-attrs' into 'master'Rémy Coutable2017-08-141-3/+3
|\ \ \ \
| * | | | Remove `username` from `User#sanitize_attrs` callbackrs-remove-username-from-sanitize-attrsRobert Speicher2017-08-111-3/+3
* | | | | Merge branch '36404-do-not-run-flaky-examples-check-for-docs-changes' into 'm...Robert Speicher2017-08-141-0/+1
|\ \ \ \ \
| * | | | | Don't run the `flaky-examples-check` job for docs branches36404-do-not-run-flaky-examples-check-for-docs-changesRémy Coutable2017-08-141-0/+1
* | | | | | Merge branch 'gitaly-test-bundle-path' into 'master'Rémy Coutable2017-08-142-7/+22
|\ \ \ \ \ \
| * | | | | | Use existing BUNDLE_PATH for gitaly in local testsgitaly-test-bundle-pathJacob Vosmaer2017-08-112-7/+22
* | | | | | | Merge branch '36236-auto-detect-metrics-for-auto-deployed-environments' into ...Rémy Coutable2017-08-146-15/+69
|\ \ \ \ \ \ \
| * | | | | | | Improve Prometheus docs, include nginx ingressJoshua Lambert2017-08-146-15/+69
|/ / / / / / /
* | | | | | | Merge branch '36089-handle-ref-failure-better' into 'master'Douwe Maan2017-08-1422-162/+223
|\ \ \ \ \ \ \
| * | | | | | | Use with_repo_branch_commit instead of fetch_ref directlyLin Jen-Shin2017-08-142-11/+9
| * | | | | | | Add comments about why we're stubbing them36089-handle-ref-failure-betterLin Jen-Shin2017-08-141-2/+2
| * | | | | | | 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