Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'notebooklab-in-repo' into 'master' | Jacob Schatz | 2017-04-24 | 22 | -5736/+933 |
|\ | |||||
| * | Merge branch 'master' into notebooklab-in-reponotebooklab-in-repo | Phil Hughes | 2017-04-13 | 61 | -2015/+2137 |
| |\ | |||||
| * | | Pulled in latest changes | Phil Hughes | 2017-04-13 | 1 | -14/+59 |
| * | | Pulled in latest changes from NotebookLab | Phil Hughes | 2017-04-13 | 1 | -0/+4 |
| * | | Merge branch 'master' into notebooklab-in-repo | Phil Hughes | 2017-04-13 | 162 | -1219/+3343 |
| |\ \ | |||||
| * | | | Pull in fixture files from the repo | Phil Hughes | 2017-04-11 | 6 | -7/+49 |
| * | | | Removed notebooklab vendor file | Phil Hughes | 2017-04-11 | 1 | -5887/+0 |
| * | | | Moved NotebookLab assets into repo | Phil Hughes | 2017-04-11 | 19 | -2/+841 |
* | | | | Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' | Sean McGivern | 2017-04-24 | 4 | -5/+28 |
|\ \ \ \ | |||||
| * | | | | Optimize project namespace lookup for milestones and add specssh-optimize-milestone-polymorphic-url | Stan Hu | 2017-04-24 | 3 | -5/+24 |
| * | | | | Eliminate N+1 queries in loading namespaces for every issuable in milestones | Stan Hu | 2017-04-23 | 2 | -1/+5 |
* | | | | | Merge branch 'dm-fix-position-tracer-for-hidden-lines' into 'master' | Sean McGivern | 2017-04-24 | 3 | -8/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Fix commenting on an existing discussion on an unchanged line that is no long... | Douwe Maan | 2017-04-24 | 3 | -8/+15 |
| |/ / / / | |||||
* | | | | | Merge branch 'diff-discussion-buttons-spacing' into 'master' | Annabel Dunstone Gray | 2017-04-24 | 2 | -0/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Fixes the spacing around diff discussion buttonsdiff-discussion-buttons-spacing | Phil Hughes | 2017-04-24 | 2 | -0/+5 |
* | | | | | | Merge branch 'test-pg' into 'master' | Rémy Coutable | 2017-04-24 | 6 | -85/+212 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Properly use $BUNDLE_INSTALL_FLAGStest-pg-mysqltest-pg | Lin Jen-Shin | 2017-04-13 | 2 | -5/+4 |
| * | | | | | | Always use . and add more comments to prepare_build.sh | Lin Jen-Shin | 2017-04-13 | 2 | -2/+7 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysql | Lin Jen-Shin | 2017-04-12 | 19 | -146/+221 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Remove duplicated line | Lin Jen-Shin | 2017-04-12 | 1 | -1/+0 |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysql | Lin Jen-Shin | 2017-04-12 | 185 | -1248/+3349 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Avoid Rails generating complicated query, see: | Lin Jen-Shin | 2017-04-11 | 1 | -1/+1 |
| * | | | | | | | | Move variables back to where they are | Lin Jen-Shin | 2017-04-11 | 1 | -6/+6 |
| * | | | | | | | | Just set GITLAB_DATABASE in the script | Lin Jen-Shin | 2017-04-11 | 2 | -7/+1 |
| * | | | | | | | | Add # host for development and test as well | Lin Jen-Shin | 2017-04-11 | 1 | -0/+2 |
| * | | | | | | | | We cannot use array in yaml variables | Lin Jen-Shin | 2017-04-11 | 2 | -3/+6 |
| * | | | | | | | | Set profiler only for postgresql not mysql | Lin Jen-Shin | 2017-04-10 | 1 | -1/+1 |
| * | | | | | | | | Use GITLAB_DATABASE: $CI_JOB_NAME[1] so that we | Lin Jen-Shin | 2017-04-10 | 2 | -29/+21 |
| * | | | | | | | | Replace on host rather than socket, feedback: | Lin Jen-Shin | 2017-04-10 | 1 | -1/+1 |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysql | Lin Jen-Shin | 2017-04-10 | 462 | -4822/+10582 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into test-pg-mysql | Lin Jen-Shin | 2017-04-07 | 1165 | -6149/+77800 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Only upload/download knapsack reports from pg | Lin Jen-Shin | 2017-03-29 | 1 | -4/+4 |
| * | | | | | | | | | | Switch back to original repository | Lin Jen-Shin | 2017-03-29 | 1 | -1/+1 |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysql | Lin Jen-Shin | 2017-03-29 | 154 | -457/+787 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into test-pg-mysql | Lin Jen-Shin | 2017-03-27 | 270 | -1508/+3639 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Test all on EE, only master on CE, and -mysql branches | Lin Jen-Shin | 2017-03-24 | 1 | -0/+12 |
| * | | | | | | | | | | | | Note that install knapsack later than bundle install | Lin Jen-Shin | 2017-03-24 | 1 | -1/+3 |
| * | | | | | | | | | | | | Test both PostgreSQL and MySQL for the win. | Lin Jen-Shin | 2017-03-24 | 4 | -84/+202 |
* | | | | | | | | | | | | | Merge branch '30305-oauth-token-push-code' into 'master' | Rémy Coutable | 2017-04-24 | 4 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Allow OAuth clients to push code30305-oauth-token-push-code | Timothy Andrew | 2017-04-13 | 4 | -4/+8 |
* | | | | | | | | | | | | | | Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax' | Rémy Coutable | 2017-04-24 | 169 | -362/+91 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Unnecessary "include WaitForAjax" and "include ApiHelpers" | Jacopo | 2017-04-21 | 170 | -364/+91 |
* | | | | | | | | | | | | | | | Merge branch 'sh-optimize-duplicate-routable-full-path' into 'master' | Sean McGivern | 2017-04-24 | 3 | -2/+35 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Cache Routable#full_path in RequestStore to reduce duplicate route loadssh-optimize-duplicate-routable-full-path | Stan Hu | 2017-04-24 | 3 | -2/+35 |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'patch-8' into 'master' | Rémy Coutable | 2017-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | doc: fix gitaly url typo | Elan Ruusamäe | 2017-04-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' | Kamil Trzciński | 2017-04-24 | 7 | -88/+137 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Simplify specs and remove unnecessary attributestc-realtime-every-pipeline-on-mr | Toon Claes | 2017-04-24 | 2 | -13/+4 |
| * | | | | | | | | | | | | | | | | Refactor ExpirePipelineCacheWorker#perform | Toon Claes | 2017-04-24 | 3 | -13/+27 |
| * | | | | | | | | | | | | | | | | Use a better performing query to find all MRs for pipeline | Toon Claes | 2017-04-24 | 5 | -10/+48 |