summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | instruct yarn to utilize the persistant .yarn-cache directoryMike Greiling2017-05-162-2/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '24373-warning-message-go-away' into 'master' Phil Hughes2017-05-163-3/+49
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes warning message should go away once resolved Closes #24373 See merge request !10823
| * | | | | | | | | | | Notes: Warning message should go away once resolvedJacopo2017-05-153-3/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flash error messages disappear(`fadeOut`) automatically after any successful request
* | | | | | | | | | | | Merge branch '32231-fix-transient-failure-of-deployment-query-spec' into ↵Robert Speicher2017-05-161-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix transient failure of deployment query spec Closes #32231 See merge request !11371
| * | | | | | | | | | | | Due to DB rounding timestamp to 1s resolution - freeze date on non ↵Pawel Chojnacki2017-05-151-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fractional time
* | | | | | | | | | | | | Merge branch 'issue-boards-label-filtering' into 'master' Filipa Lacerda2017-05-162-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards not filtering when URL params are encoded Closes #32084 See merge request !11320
| * | | | | | | | | | | | | Fixed tests with params being wrongissue-boards-label-filteringPhil Hughes2017-05-151-1/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed issue boards not filtering when URL params are encodedPhil Hughes2017-05-122-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #32084
* | | | | | | | | | | | | | Merge branch '31898-pipeline-table-alignment' into 'master' Filipa Lacerda2017-05-161-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra pipeline margin Closes #31898 See merge request !11255
| * | | | | | | | | | | | | | Remove extra pipeline margin31898-pipeline-table-alignmentAnnabel Dunstone Gray2017-05-101-2/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '29421-production-config-assets-compile-false' into 'master' Stan Hu2017-05-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set 'config.assets.compile = false' in production Closes #29421 See merge request !9917
| * | | | | | | | | | | | | | | Set 'config.assets.compile = false' in production29421-production-config-assets-compile-falseJames Edwards-Jones2017-03-141-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'dm-rename-column-concurrently-with-null' into 'master' Yorick Peterse2017-05-152-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow NULL on renamed column after default has been set See merge request !11396
| * | | | | | | | | | | | | | | | Disallow NULL on renamed column after default has been setDouwe Maan2017-05-152-3/+6
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'omega-submodules' into 'master'Robert Speicher2017-05-153-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omega submodules See merge request !10797
| * | | | | | | | | | | | | | | | submodule_links: Handle in-repository submodule urlsDavid Turner2017-05-153-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it is useful to store submodules in the same repository which contains links to them. Make the UI support this. See https://github.com/twosigma/git-meta/wiki/The-Omega-Repo for information about this strategy Signed-off-by: David Turner <novalis@novalis.org>
* | | | | | | | | | | | | | | | | Merge branch '31902-namespace-recent-searches-to-project' into 'master' Annabel Dunstone Gray2017-05-156-25/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scope recent searches to project Closes #31902 See merge request !11142
| * | | | | | | | | | | | | | | | | Scope recent searches to projectEric Eastwood2017-05-156-25/+52
| | |_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902
* | | | | | | | | | | | | | | | | Merge branch 'revert-0663458c' into 'master' Douwe Maan2017-05-1525-125/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" See merge request !11395
| * | | | | | | | | | | | | | | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-1525-125/+121
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !11287
* | | | | | | | | | | | | | | | 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