summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widgetMike Greiling2017-05-152-1/+3
* Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-157-11/+11
|\
| * Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-137-11/+11
* | Merge branch 'bvl-fix-static-analysis-failure-in-users-finder' into 'master' Rémy Coutable2017-05-151-1/+1
|\ \
| * | Fix trailing ',' in hash.Bob Van Landuyt2017-05-151-1/+1
|/ /
* | Merge branch 'docs/install-git' into 'master' Sean Packham (GitLab)2017-05-153-0/+71
|\ \
| * | fix broken linkMarcia Ramos2017-05-151-1/+1
| * | add article - how to install gitMarcia Ramos2017-05-153-0/+71
* | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' Douwe Maan2017-05-1525-121/+125
|\ \ \
| * | | Remove old migration spec.bvl-rename-build-events-to-job-eventsBob Van Landuyt2017-05-151-74/+0
| * | | Add `build_events` to project service in the APIBob Van Landuyt2017-05-152-1/+5
| * | | Rename `build_events` to `job_events` in codeBob Van Landuyt2017-05-1517-43/+45
| * | | Rename `build_events` columns to `job_events`Bob Van Landuyt2017-05-155-3/+75
* | | | Merge branch '32016-escape-instant-comments-and-slash-commands' into 'master' Douwe Maan2017-05-152-6/+45
|\ \ \ \
| * | | | Improve slash command stripping, escape temporary note contentsKushal Pandya2017-05-152-6/+45
|/ / / /
* | | | Merge branch '32236-fix-typo-in-helm-chart-installation-doc' into 'master' Achilleas Pipinellis2017-05-151-2/+2
|\ \ \ \
| * | | | Fix typoJoshua Lambert2017-05-151-2/+2
|/ / / /
* | | | Merge branch '32184-retried-jobs' into 'master' Phil Hughes2017-05-152-2/+2
|\ \ \ \
| * | | | Use fa-refresh on retried jobs32184-retried-jobsAnnabel Dunstone Gray2017-05-122-2/+2
* | | | | Merge branch 'fix-github-import' into 'master' Douwe Maan2017-05-152-1/+8
|\ \ \ \ \
| * | | | | Add CHANGELOGfix-github-importDouglas Barbosa Alexandre2017-05-111-0/+4
| * | | | | Reset create callbacks for Issues/MRs while importing GitHub projectsDouglas Barbosa Alexandre2017-05-111-0/+2
| * | | | | Fix token interpolation when setting the Github remoteDouglas Barbosa Alexandre2017-05-111-1/+2
* | | | | | Merge branch 'gitaly-reuse-stubs' into 'master' Robert Speicher2017-05-1512-66/+59
|\ \ \ \ \ \
| * | | | | | Log gitaly output during testingJacob Vosmaer2017-05-151-1/+2
| * | | | | | Don't reuse gRPC channelsJacob Vosmaer2017-05-1512-65/+57
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '31886-remover-comment-load-spinner' into 'master' Annabel Dunstone Gray2017-05-152-3/+4
|\ \ \ \ \ \
| * | | | | | 31886 Remove spinner from loading comment31886-remover-comment-load-spinnertauriedavis2017-05-122-3/+4
* | | | | | | Merge branch 'spec-minor-fix' into 'master' Rémy Coutable2017-05-151-8/+1
|\ \ \ \ \ \ \
| * | | | | | | Minor spec improvementspec-minor-fixValery Sizov2017-05-151-8/+1
* | | | | | | | Merge branch 'fix-merge-request-show-component-z-indices' into 'master' Annabel Dunstone Gray2017-05-153-2/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | MR zindex regressionLuke "Jared" Bennett2017-05-153-2/+4
|/ / / / / / /
* | | | | | | Merge branch '30893-create-users-finder' into 'master' Rémy Coutable2017-05-153-10/+141
|\ \ \ \ \ \ \
| * | | | | | | Create a Users FinderGeorge Andrinopoulos2017-05-153-10/+141
|/ / / / / / /
* | | | | | | Merge branch 'adam-influxdb-hostname' into 'master' Douwe Maan2017-05-152-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostnameAdam Niedzielski2017-05-132-0/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'dm-dependency-linker-file-type' into 'master' Robert Speicher2017-05-153-5/+10
|\ \ \ \ \ \ \
| * | | | | | | Select dependency linker based on file typedm-dependency-linker-file-typeDouwe Maan2017-05-123-5/+10
* | | | | | | | Merge branch 'dz-fix-file-mode' into 'master' Douwe Maan2017-05-151-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-modeDmitriy Zaporozhets2017-05-151-0/+0
* | | | | | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-05-151-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Runners tab is now CI/CD PipelinesBen Bodenmiller2017-05-121-3/+3
* | | | | | | | | | Merge branch 'update-seed-repo-rb' into 'master' Rémy Coutable2017-05-152-1/+172
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add script to regenerate seed_repo.rb for Gitlab::Git testsJacob Vosmaer (GitLab)2017-05-152-1/+172
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'enable-auto-cancelling-by-default' into 'master' Kamil Trzciński2017-05-155-3/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable transaction for updating the tableLin Jen-Shin2017-05-151-0/+2
| * | | | | | | | | | Move to post_migrate and use update_column_in_batchesLin Jen-Shin2017-05-151-2/+1
| * | | | | | | | | | Disable auto_cancel_pending_pipelines in PostReceive testLin Jen-Shin2017-05-151-2/+5
| * | | | | | | | | | Make auto-cancelling pending pipelines on by defaultLin Jen-Shin2017-05-154-1/+32
* | | | | | | | | | | Merge branch 'add-index-for-auto_canceled_by_id-mysql' into 'master' Kamil Trzciński2017-05-154-0/+48
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |