summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add higher z-index to fixed nav32303-nav-z-indexAnnabel Dunstone Gray2017-05-151-0/+1
|
* Merge branch 'use-gitaly-migrate' into 'master' Douwe Maan2017-05-151-3/+3
|\ | | | | | | | | Use gitaly_migrate helper on all current migrations in repository See merge request !11309
| * Use gitaly_migrate helper on all current migrations in repositoryuse-gitaly-migrateAlejandro Rodríguez2017-05-111-3/+3
| |
* | Merge branch '31106-tabs-alignment' into 'master' Annabel Dunstone Gray2017-05-157-55/+82
|\ \ | | | | | | | | | | | | | | | | | | fix Resolved Discussions counter wrapping to next line Closes #31106 See merge request !10775
| * | fix Resolved Discussions counter wrapping to next lineSimon Knox2017-05-137-55/+82
| | | | | | | | | | | | | | | change all .nav-links to use flex place Resolve Discussions above tabs on small screens, and to the right on large
* | | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-157-11/+11
|\ \ \ | | | | | | | | | | | | | | | | Rename all references to rendered_title to realtime_changes See merge request !11359
| * | | 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 in `user_finder_spec See merge request !11387
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Technical article "How to install Git" See merge request !11384
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
| * | | | | Remove old migration spec.bvl-rename-build-events-to-job-eventsBob Van Landuyt2017-05-151-74/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From this point, the `services` table doesn't have the `build_events` flag anymore. So instead of updating the spec for this, I removed it. It should have been executed at this point.
| * | | | | Add `build_events` to project service in the APIBob Van Landuyt2017-05-152-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | For backwards compatibility
| * | | | | 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 contents Closes #32016 See merge request !11341
| * | | | | | 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 typo See merge request !11361
| * | | | | | 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 jobs Closes #32184 See merge request !11337
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix token interpolation when setting the Github remote See merge request !11311
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse gRPC stubs instead of channels Closes #31991 and gitaly#187 See merge request !11244
| * | | | | | | | Log gitaly output during testingJacob Vosmaer2017-05-151-1/+2
| | | | | | | | |
| * | | | | | | | Don't reuse gRPC channelsJacob Vosmaer2017-05-1512-65/+57
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that bad things happen when two gRPC stubs share one gRPC channel so let's stop doing that. The downside of this is that we create more gRPC connections; one per stub.
* | | | | | | | Merge branch '31886-remover-comment-load-spinner' into 'master' Annabel Dunstone Gray2017-05-152-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31886 Remove spinner from loading comment Closes #31886 See merge request !11339
| * | | | | | | | 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 improvement See merge request !11373
| * | | | | | | | | 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 regression Closes #32216 See merge request !11344
| * | | | | | | | | 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 Finder Closes #30893 See merge request !10852
| * | | | | | | | | 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 resolved Closes #24438 See merge request !11356
| * | | | | | | | | Allow GitLab instance to start when InfluxDB hostname cannot be resolvedadam-influxdb-hostnameAdam Niedzielski2017-05-132-0/+7
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Closes #24438
* | | | | | | | | Merge branch 'dm-dependency-linker-file-type' into 'master' Robert Speicher2017-05-153-5/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Select dependency linker based on file type See merge request !11357
| * | | | | | | | | 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 755 See merge request !11369
| * | | | | | | | | | Ruby files that are not meant to be executable should be 644 not 755dz-fix-file-modeDmitriy Zaporozhets2017-05-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-05-151-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Runners tab is now CI/CD Pipelines See merge request !11326
| * | | | | | | | | | | 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 tests See merge request !11301
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make auto-cancelling pending pipelines on by default Closes #30656 See merge request !11023
| * | | | | | | | | | | | Disable transaction for updating the tableLin Jen-Shin2017-05-151-0/+2
| | | | | | | | | | | | |
View Lorry Controller Status