summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixes no this eslint error on new version of eslint.fix-new-eslint-failureJacob Schatz2018-01-221-97/+100
* Merge branch 'fix-callback-alignments' into 'master'Jacob Schatz2018-01-221-5/+15
|\
| * Fix callback alignmentsfix-callback-alignmentsClement Ho2018-01-191-5/+15
* | Merge branch 'fix-eslint-usercallout' into 'master'Jacob Schatz2018-01-221-1/+0
|\ \
| * | Fix eslint UserCalloutfix-eslint-usercalloutClement Ho2018-01-221-1/+0
* | | Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-222-20/+35
|\ \ \
| * | | Use has_table_privilege for TRIGGER on PostgreSQLfix-postgresql-table-grantYorick Peterse2018-01-222-20/+35
* | | | Update CHANGELOG.md for 10.3.6Oswaldo Ferreira2018-01-221-0/+23
* | | | Merge branch 'patch-28' into 'master'Stan Hu2018-01-221-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Update CHANGELOG.mdFrancisco Javier López2018-01-221-1/+1
|/ / /
* | | Merge branch 'add-profiler-to-application' into 'master'Stan Hu2018-01-225-11/+392
|\ \ \
| * | | Add bin/profile-url tool and docsadd-profiler-to-applicationSean McGivern2018-01-193-11/+94
| * | | Add Gitlab::Profiler for profiling from a console or runnerSean McGivern2018-01-192-0/+298
* | | | Merge branch 'projects-r-s' into 'master'Jacob Schatz2018-01-229-38/+93
|\ \ \ \
| * | | | Fix eslintprojects-r-sClement Ho2018-01-191-2/+0
| * | | | Merge branch 'master' into projects-r-sClement Ho2018-01-19116-312/+970
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add secretVariable testClement Ho2018-01-191-0/+6
| * | | | Fix eslintClement Ho2018-01-191-3/+1
| * | | | Merge branch 'master' into 'projects-r-s'Clement Ho2018-01-19103-2192/+2753
| |\ \ \ \
| * | | | | Fix referenceClement Ho2018-01-181-2/+2
| * | | | | Fix eslintClement Ho2018-01-185-16/+4
| * | | | | Code improvementsClement Ho2018-01-188-25/+14
| * | | | | [skip ci] Improve dispatcherClement Ho2018-01-181-10/+2
| * | | | | Add rest of refactor of dispatcher for project:s*Jacob Schatz2018-01-184-23/+51
| * | | | | Refactor for projects:sJacob Schatz2018-01-186-4/+53
| * | | | | refactor for projects-r*Jacob Schatz2018-01-182-2/+10
* | | | | | Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-223-1/+23
|\ \ \ \ \ \
| * | | | | | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-203-1/+23
* | | | | | | Merge branch '40029-better-error-handling-on-issuable-templates' into 'master'Clement Ho2018-01-222-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Stop loading spinner on error of issuable templatesTakuya Noguchi2018-01-212-1/+6
| |/ / / / / /
* | | | | | | Merge branch 'gitlab-shell-6.0.2' into 'master'Robert Speicher2018-01-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use gitlab-shell 6.0.2gitlab-shell-6.0.2Jacob Vosmaer2018-01-221-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'workhorse-3.5.1' into 'master'Robert Speicher2018-01-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Use gitlab-workhorse 3.5.1workhorse-3.5.1Jacob Vosmaer2018-01-221-1/+1
* | | | | | | | Merge branch 'gitaly-git-http-ssh' into 'master'Douwe Maan2018-01-224-36/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Default to Gitaly for 'git push' HTTP/SSH, and make Gitaly mandatory for SSH ...Jacob Vosmaer (GitLab)2018-01-224-36/+31
|/ / / / / / / /
* | | | | | | | Merge branch 'bvl-parent-preloading' into 'master'Douwe Maan2018-01-226-14/+102
|\ \ \ \ \ \ \ \
| * | | | | | | | Preload ancestors for subgroups matching filterBob Van Landuyt2018-01-223-12/+60
| * | | | | | | | Don't include projects shared as group-descendantsBob Van Landuyt2018-01-222-3/+14
| * | | | | | | | Fix filter on `dashboard/groups` & `explore/groupsBob Van Landuyt2018-01-223-1/+30
* | | | | | | | | Merge branch 'gitaly-write-ref-error-handling' into 'master'Robert Speicher2018-01-222-22/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Move error-handling to lib/gitlab/gitKim "BKC" Carlbäcker2018-01-222-13/+5
| * | | | | | | | Wrap Rugged-exceptions in Gitlab::Git::Repository#write_refgitaly-write-ref-error-handlingKim "BKC" Carlbäcker2018-01-182-18/+24
* | | | | | | | | Merge branch 'sh-scheduled-ci-pipeline-docs' into 'master'Achilleas Pipinellis2018-01-223-0/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add docs for playing a CI pipeline scheduleStan Hu2018-01-223-0/+15
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dispatcher-ph-more' into 'master'Filipa Lacerda2018-01-224-16/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added dispatcher imports for sessions routedispatcher-ph-morePhil Hughes2018-01-224-16/+34
* | | | | | | | | | Merge branch 'ce-fix-upload-model-tainted-after-migration-spec' into 'master'Rémy Coutable2018-01-221-3/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the Upload model being tainted after migration specMicael Bergeron2018-01-221-3/+10
* | | | | | | | | | | Merge branch '41673-blank-query-members-api' into 'master'Rémy Coutable2018-01-227-2/+47
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |