summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-201-3/+3
|\
| * Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-201-3/+3
* | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2043-198/+842
|\ \ | |/ |/|
| * Merge branch 'avatar-circles' into 'master' Fatih Acet2016-12-202-2/+1
| |\
| | * Fix sizing of avatar circles; add borderavatar-circlesAnnabel Dunstone Gray2016-12-202-2/+1
| * | Merge branch '25093-hide-new-issue-btn-non-loggedin-user' into 'master' Fatih Acet2016-12-201-1/+1
| |\ \
| | * | hides new issue btn for now loggedin userNur Rony2016-12-191-1/+1
| * | | Merge branch 'bold-wip-removed-note' into 'master' Sean McGivern2016-12-201-1/+1
| |\ \ \
| | * | | Make 'unmarked as WIP' message more consistentjurre2016-12-201-1/+1
| | | |/ | | |/|
| * | | Merge branch 'jej-memoize-milestoneish-visible-to-user' into 'master' Sean McGivern2016-12-203-6/+36
| |\ \ \ | | |/ / | |/| |
| | * | Milestoneish SQL performance partially improved and memoizedjej-memoize-milestoneish-visible-to-userJames Edwards-Jones2016-12-203-6/+36
| * | | Merge branch 'project-authorizations-diff' into 'master' Nick Thomas2016-12-204-49/+152
| |\ \ \
| | * | | Smarter refreshing of authorized projectsproject-authorizations-diffYorick Peterse2016-12-194-49/+152
| * | | | Merge branch '25678-remove-user-build' into 'master' Rémy Coutable2016-12-201-4/+0
| |\ \ \ \
| | * | | | remove build_user from model UserArsenev Vladislav2016-12-181-4/+0
| * | | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-2012-112/+225
| |\ \ \ \ \
| | * | | | | Add Project#gitea_import?22348-gitea-importerRémy Coutable2016-12-191-0/+4
| | * | | | | Namespace access token session key in `Import::GithubController`Rémy Coutable2016-12-192-12/+20
| | * | | | | Reduce duplication for GitHubish import status viewRémy Coutable2016-12-194-121/+66
| | * | | | | Improve Gitlab::ImportSourcesRémy Coutable2016-12-192-31/+3
| | * | | | | Modify GithubImport to support GiteaRémy Coutable2016-12-194-12/+11
| | * | | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-1912-153/+162
| | * | | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-198-1/+177
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '22864-kubernetes-deploy-with-terminal' into 'master' Kamil Trzciński2016-12-2020-23/+426
| |\ \ \ \ \
| | * | | | | Add terminal UI and controller actionsFatih Acet2016-12-1913-10/+119
| | * | | | | Add terminals to the Kubernetes deployment serviceNick Thomas2016-12-196-12/+118
| | * | | | | Add a ReactiveCaching concern for use in the KubernetesServiceNick Thomas2016-12-192-0/+125
| | * | | | | Add xterm.js 2.1.0 and a wrapper class to the asset pipelineNick Thomas2016-12-192-0/+67
| | * | | | | 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 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ...Kamil Trzcinski2016-12-201-3/+6
|\ \ \ \ \ \ \
| * | | | | | | Pedro copy changesLuke "Jared" Bennett2016-12-201-3/+6
* | | | | | | | WIPKamil Trzcinski2016-12-204-24/+17
* | | | | | | | Work on tests for mattermostKamil Trzcinski2016-12-201-4/+4
* | | | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2037-185/+343
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-208-52/+185
| |\ \ \ \ \ \
| | * | | | | | Improve code designKamil Trzcinski2016-12-192-6/+8
| | * | | | | | Fix spec failuresKamil Trzcinski2016-12-181-1/+1
| | * | | | | | Added slack slash commands frontend help wellLuke "Jared" Bennett2016-12-182-0/+97
| | * | | | | | Use Slack::Notifier::LinkFormatter to convert markdown links to slack compatKamil Trzcinski2016-12-163-12/+11
| | * | | | | | Fix SlackSlashCommands testsKamil Trzcinski2016-12-162-2/+2
| | * | | | | | Fix specsKamil Trzcinski2016-12-161-3/+2
| | * | | | | | Render format dependent linksKamil Trzcinski2016-12-163-2/+19
| | * | | | | | Use single presenter for everythingKamil Trzcinski2016-12-163-14/+2
| | * | | | | | Rename ChatService into ChatSlashCommandsServiceKamil Trzcinski2016-12-165-81/+60
| | * | | | | | Create Slack Slash command serviceZ.J. van de Weg2016-12-164-2/+53
| * | | | | | | Merge branch '25810-misaligned-count' into 'master' Fatih Acet2016-12-202-3/+19
| |\ \ \ \ \ \ \
| | * | | | | | | Align milestone column header with count number25810-misaligned-countSam Rose2016-12-192-3/+19
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch '25735-font-size' into 'master' Fatih Acet2016-12-201-1/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Update font size of detail page header to 14px25735-font-sizeAnnabel Dunstone Gray2016-12-191-1/+0