summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-261-1/+1
|\
| * Add more storage statisticsMarkus Koller2016-12-211-1/+1
* | Merge branch 'permit-uploadedfile-scalar' into 'master' Rémy Coutable2016-12-231-0/+16
|\ \
| * | Monkey-patch StrongParameters for ::UploadedFileJacob Vosmaer2016-12-231-0/+16
* | | Merge branch '25896-fix-404-katax-fonts' into 'master' Alfredo Sumaran2016-12-221-0/+2
|\ \ \
| * | | Add KaTeX fonts to assets paths and precompileHiroyuki Sato2016-12-221-0/+2
* | | | Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-211-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Changes after reviewFilipa Lacerda2016-12-211-2/+0
| * | | Remove builds tab from commitFilipa Lacerda2016-12-211-1/+0
| * | | Removes builds tab from merge requestFilipa Lacerda2016-12-211-1/+0
* | | | Merge branch 'backport-mr-widget-ci-js' into 'master' Alfredo Sumaran2016-12-211-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove unneeded bundle refs.backport-mr-widget-ci-jsBryce Johnson2016-12-211-2/+0
| * | | Backport moving MR widget CI JS out of script tag.Bryce Johnson2016-12-211-0/+3
* | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-212-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-205-1/+12
| |\ \ \ | | | |/ | | |/|
| * | | Improve sourcesKamil Trzcinski2016-12-191-1/+1
| * | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-5/+1
| * | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1811-10/+43
| |\ \ \
| * | | | Fix configure routeLuke "Jared" Bennett2016-12-171-1/+1
| * | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-161-1/+0
| * | | | Add MattermostControllerZ.J. van de Weg2016-12-161-0/+6
| * | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-162-0/+6
* | | | | Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-211-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added support for Authentiq oauth providerAlex2016-12-211-0/+10
| | |/ / | |/| |
* | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-201-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-198-6/+35
| |\ \ \ | | |/ /
| * | | Render stage dropdown in separate API call as HTMLKamil Trzcinski2016-12-191-0/+1
* | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-202-1/+7
|\ \ \ \
| * | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-192-2/+2
| * | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-192-1/+7
| | |/ / | |/| |
* | | | Add terminal UI and controller actionsFatih Acet2016-12-191-0/+2
* | | | Add a ReactiveCaching concern for use in the KubernetesServiceNick Thomas2016-12-191-0/+1
* | | | Add xterm.js 2.1.0 and a wrapper class to the asset pipelineNick Thomas2016-12-191-0/+2
|/ / /
* | | Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-171-1/+1
|\ \ \
| * | | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-161-1/+1
* | | | Fix rubocop failureszj-mattermost-sessionKamil Trzcinski2016-12-171-2/+2
* | | | Store mattermost_url in settingsKamil Trzcinski2016-12-172-0/+13
* | | | Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-162-2/+6
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-165-3/+13
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-141-7/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-148-16/+34
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-309-158/+184
| |\ \ \ \ \
| * | | | | | Remove code to clone Bitbucket repositories using SSHDouglas Barbosa Alexandre2016-11-211-2/+0
| * | | | | | Add custom OmniAuth strategy for Bitbucket OAuth2Douglas Barbosa Alexandre2016-11-211-0/+6
* | | | | | | Merge branch '18435-autocomplete-is-not-performant' into 'master' Fatih Acet2016-12-161-1/+12
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Changed autocomplete_sources into an action that returns a single 'at' type o...18435-autocomplete-is-not-performantLuke Bennett2016-12-151-1/+12
| | |_|_|/ / | |/| | | |
* | | | | | Calls to the API are checked for scope.Timothy Andrew2016-12-162-2/+3
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'rs-filter-params' into 'security' bpj-issuable-sidebar-autoupdatebackport-link_to_member_avatarRémy Coutable2016-12-151-1/+3
* | | | | Merge branch 'katex-math' into 'master' Sean McGivern2016-12-152-0/+4
|\ \ \ \ \
| * | | | | Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-142-0/+4
View Lorry Controller Status