summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into test-pg-mysqlLin Jen-Shin2017-03-27270-1508/+3639
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Test all on EE, only master on CE, and -mysql branchesLin Jen-Shin2017-03-241-0/+12
| * | | | | | | | | | | | | | | | Note that install knapsack later than bundle installLin Jen-Shin2017-03-241-1/+3
| * | | | | | | | | | | | | | | | Test both PostgreSQL and MySQL for the win.Lin Jen-Shin2017-03-244-84/+202
* | | | | | | | | | | | | | | | | Merge branch '30305-oauth-token-push-code' into 'master' Rémy Coutable2017-04-244-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Allow OAuth clients to push code30305-oauth-token-push-codeTimothy Andrew2017-04-134-4/+8
* | | | | | | | | | | | | | | | | | Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'Rémy Coutable2017-04-24169-362/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Unnecessary "include WaitForAjax" and "include ApiHelpers"Jacopo2017-04-21170-364/+91
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-optimize-duplicate-routable-full-path' into 'master' Sean McGivern2017-04-243-2/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Cache Routable#full_path in RequestStore to reduce duplicate route loadssh-optimize-duplicate-routable-full-pathStan Hu2017-04-243-2/+35
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'patch-8' into 'master' Rémy Coutable2017-04-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | doc: fix gitaly url typoElan Ruusamäe2017-04-181-1/+1
* | | | | | | | | | | | | | | | | | | | Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-247-88/+137
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Simplify specs and remove unnecessary attributestc-realtime-every-pipeline-on-mrToon Claes2017-04-242-13/+4
| * | | | | | | | | | | | | | | | | | | | Refactor ExpirePipelineCacheWorker#performToon Claes2017-04-243-13/+27
| * | | | | | | | | | | | | | | | | | | | Use a better performing query to find all MRs for pipelineToon Claes2017-04-245-10/+48
| * | | | | | | | | | | | | | | | | | | | Properly expire cache for **all** MRs of a pipelineToon Claes2017-04-245-60/+66
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-243-20/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Add changelog entry for blocked pipeline duration fixfix/gb/fix-blocked-pipeline-durationGrzegorz Bizon2017-04-211-0/+4
| * | | | | | | | | | | | | | | | | | | | | Improve helpers in pipeline model specsGrzegorz Bizon2017-04-211-3/+3
| * | | | | | | | | | | | | | | | | | | | | Fix missing pipeline duration for blocked pipelinesGrzegorz Bizon2017-04-212-19/+48
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-246-21/+114
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Add changelog entry for latest commit status fixfix/gb/fix-incorrect-commit-status-badge-textGrzegorz Bizon2017-04-211-0/+4
| * | | | | | | | | | | | | | | | | | | | | Add specs for new ci status helper methodGrzegorz Bizon2017-04-211-9/+38
| * | | | | | | | | | | | | | | | | | | | | Deprecate legacy CI/CD status helpersGrzegorz Bizon2017-04-211-1/+7
| * | | | | | | | | | | | | | | | | | | | | Fix lastest commit status text on main project pageGrzegorz Bizon2017-04-214-11/+65
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs-empty-project-features' into 'master' Rémy Coutable2017-04-2418-44/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Use `:empty_project` where possible in top-level feature specsrs-empty-project-featuresRobert Speicher2017-04-2018-44/+56
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'email-handler-metrics' into 'master' Sean McGivern2017-04-245-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Make handler metric params more explicitemail-handler-metricsSean McGivern2017-04-215-5/+17
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into 'master' Douwe Maan2017-04-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Correct typo (missing 's') in project pipeline job list endpointBen Getsug2017-04-211-1/+1
| | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dz-fix-spec-filenames-ce' into 'master' Sean McGivern2017-04-245-51/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Fix outdated specs that were not executed due to wrong filenameDmitriy Zaporozhets2017-04-242-4/+6
| * | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect spec filenames which were ingored by CIdz-fix-spec-filenames-ceDmitriy Zaporozhets2017-04-245-47/+40
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch '29335-fix-request-access-button-visibility' into 'master' Douwe Maan2017-04-241-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Added test to prevent ‘Request access’ regression29335-fix-request-access-button-visibilityJames Edwards-Jones2017-04-221-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mrchrisw-22740-merge-api' into 'master' Sean McGivern2017-04-243-4/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-apiChris Wilson2017-04-243-4/+21
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'db-backup-ssl-support' into 'master' Achilleas Pipinellis2017-04-242-5/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Database SSL support for backup script.Guillaume2017-04-052-5/+25
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gitaly-upgrade-doc' into 'master' Sean McGivern2017-04-241-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 9.1 Gitaly source update stepsJacob Vosmaer2017-04-241-0/+11
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'siemens/gitlab-ce-uploads-api' into 'master' Rémy Coutable2017-04-241-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | docs(api): add curl arguments for file uploadsiemens/gitlab-ce-uploads-apiMarion Deveaud2017-04-211-2/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs-rename-login_as' into 'master' Rémy Coutable2017-04-249-18/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Return early from `finished_all_ajax_requests?` when jQuery is undefinedrs-rename-login_asRobert Speicher2017-04-191-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the `javascript_test?` helperRobert Speicher2017-04-191-1/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Except where necessary, use `sign_in` over `login_as` in featuresRobert Speicher2017-04-197-13/+70
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused `skip_ci_admin_auth` helperRobert Speicher2017-04-191-4/+0