summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix reset pathfix/group-path-rename-errorJames Lopez2016-12-211-1/+1
* added more specsJames Lopez2016-12-213-4/+8
* update controller action to render error in formJames Lopez2016-12-211-4/+1
* Fix error 500 renaming group. Also added specs and changelog.James Lopez2016-12-207-11/+83
* Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-203-159/+91
|\
| * Move admin projects spinach tests to rspecSemyon Pupkov2016-12-193-159/+91
* | Merge branch 'doc-for-pipeline-duration' into 'master' Rémy Coutable2016-12-201-0/+31
|\ \
| * | Add docs for pipeline durationdoc-for-pipeline-durationLin Jen-Shin2016-12-151-0/+31
* | | Merge branch '22348-gitea-importer-docs' into 'master' Rémy Coutable2016-12-204-5/+85
|\ \ \
| * | | Fix link to img22348-gitea-importer-docsAchilleas Pipinellis2016-12-191-1/+1
| * | | Remove duplicate image and optimize the remaining oneAchilleas Pipinellis2016-12-192-0/+0
| * | | Add doc for the Gitea importerRémy Coutable2016-12-195-5/+85
* | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-2039-657/+1357
|\ \ \ \
| * | | | Add Project#gitea_import?22348-gitea-importerRémy Coutable2016-12-195-5/+21
| * | | | Namespace access token session key in `Import::GithubController`Rémy Coutable2016-12-196-30/+38
| * | | | Reduce duplication for GitHubish import status viewRémy Coutable2016-12-195-131/+89
| * | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-194-43/+125
| * | | | Modify GithubImport to support GiteaRémy Coutable2016-12-1922-337/+513
| * | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-1926-433/+632
| * | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-1921-23/+284
| |/ / /
* | | | Merge branch 'nuke-ugly-spaces-in-changelog-generator' into 'master' Robert Speicher2016-12-202-3/+12
|\ \ \ \
| * | | | Remove trailing whitespace when generating changelog entrynuke-ugly-spaces-in-changelog-generatorAdam Niedzielski2016-12-092-3/+12
* | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-2050-68/+5805
|\ \ \ \ \
| * | | | | Add online terminal documentationNick Thomas2016-12-199-11/+149
| * | | | | Add changelog entryNick Thomas2016-12-191-0/+4
| * | | | | Add terminal UI and controller actionsFatih Acet2016-12-1918-13/+189
| * | | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-1915-43/+546
| * | | | | Add a ReactiveCaching concern for use in the KubernetesServiceNick Thomas2016-12-196-0/+324
| * | | | | Add xterm.js 2.1.0 and a wrapper class to the asset pipelineNick Thomas2016-12-196-0/+4596
| * | | | | Remove unnecessary hidden svg elements for icons.Fatih Acet2016-12-191-4/+0
| * | | | | Fix consistent typo in environment.jsFatih Acet2016-12-191-5/+5
* | | | | | Merge branch '25848-fix-git-rev-list-env-parsing' into 'master' Sean McGivern2016-12-202-2/+9
|\ \ \ \ \ \
| * | | | | | Reject blank environment vcariables in Gitlab::Git::RevList25848-fix-git-rev-list-env-parsingRémy Coutable2016-12-202-2/+9
* | | | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-2037-242/+483
|\ \ \ \ \ \ \
| * | | | | | | Fix specszj-kamil-slack-slash-commandsKamil Trzcinski2016-12-193-28/+20
| * | | | | | | Improve after feedbackKamil Trzcinski2016-12-199-51/+32
| * | | | | | | Fix previously reverted spec failuresKamil Trzcinski2016-12-197-47/+47
| * | | | | | | Improve code designKamil Trzcinski2016-12-192-6/+8
| * | | | | | | Fix failuresKamil Trzcinski2016-12-181-1/+1
| * | | | | | | Fix spec failuresKamil Trzcinski2016-12-184-4/+5
| * | | | | | | Remove not related spec changesKamil Trzcinski2016-12-186-43/+43
| * | | | | | | Fix RubocopKamil Trzcinski2016-12-181-2/+2
| * | | | | | | Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-183-0/+145
| * | | | | | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-1612-58/+57
| * | | | | | | Fix SlackSlashCommands testsKamil Trzcinski2016-12-168-118/+127
| * | | | | | | Fix specsKamil Trzcinski2016-12-163-8/+12
| * | | | | | | Render format dependent linksKamil Trzcinski2016-12-166-99/+132
| * | | | | | | Use Slack compatible syntaxKamil Trzcinski2016-12-161-4/+4
| * | | | | | | Use single presenter for everythingKamil Trzcinski2016-12-163-14/+2
| * | | | | | | Rename Mattermost::Presenter to PresenterKamil Trzcinski2016-12-162-131/+133