summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Revert specific URLzj-revert-polymorphic-urlZ.J. van de Weg2016-12-271-3/+3
|
* Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-266-79/+98
|\ | | | | | | | | Add more storage statistics See merge request !7754
| * Add more storage statisticsMarkus Koller2016-12-215-43/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds counters for build artifacts and LFS objects, and moves the preexisting repository_size and commit_count from the projects table into a new project_statistics table. The counters are displayed in the administration area for projects and groups, and also available through the API for admins (on */all) and normal users (on */owned) The statistics are updated through ProjectCacheWorker, which can now do more granular updates with the new :statistics argument.
| * Remove rake task update_commit_countMarkus Koller2016-12-211-20/+0
| |
| * Consistently use current_user in API entitiesMarkus Koller2016-12-213-21/+21
| |
| * Don't expose all namespace fields in APIMarkus Koller2016-12-211-2/+2
| |
* | Merge branch 'zj-fix-issue-search-chat-command' into 'master' Rémy Coutable2016-12-232-8/+9
|\ \ | | | | | | | | | | | | | | | | | | Fix errorcode 500 on slash commands Closes #26013 See merge request !8285
| * | Fix errorcode 500 on slash commandszj-fix-issue-search-chat-commandZ.J. van de Weg2016-12-232-8/+9
| | | | | | | | | | | | Coverage was failing, so this could slip through the cracks
* | | Merge branch 'fixes-issues-api-reopen' into 'master' Rémy Coutable2016-12-231-2/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix state_event parameter to reopen an issue Closes #25958 See merge request !8246
| * | Fix state_event parameter to reopen an issuefixes-issues-api-reopenRobert Schilling2016-12-221-2/+1
| | |
* | | Merge branch 'inline-math-dollar' into 'master' Robert Speicher2016-12-221-8/+3
|\ \ \ | | | | | | | | | | | | | | | | Don't render inline math when dollar signs are inside markup See merge request !8259
| * | | Don't render inline math when dollar signs are inside markupinline-math-dollarDouwe Maan2016-12-221-8/+3
| |/ /
* | | Merge branch 'cache-last-commit-sha-for-path' into 'master' Yorick Peterse2016-12-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Cache last commit id for path See merge request !8098
| * | | Merge two methods.Hiroyuki Sato2016-12-201-1/+1
| | | |
| * | | Rename sha to idHiroyuki Sato2016-12-201-1/+1
| | | |
| * | | Use Repository#cache_last_commit_sha_for_path in APIHiroyuki Sato2016-12-201-1/+1
| | | |
* | | | Use `ref` variable24224-fix-project-ref-cacheDouwe Maan2016-12-221-1/+1
| | | |
* | | | Fix lookup of project by unknown ref when caching is enabledDouwe Maan2016-12-221-4/+15
| |/ / |/| |
* | | Merge branch 'adam-auto-deploy' into 'master' Kamil Trzciński2016-12-211-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Auto deploy Closes #23580 See merge request !8135
| * | | Introduce "Set up autodeploy" button to help configure GitLab CI for deploymentadam-auto-deployAdam Niedzielski2016-12-211-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | The button allows to choose a ".gitlab-ci.yml" template that automatically sets up the deployment of an application. The currently supported template is Kubernetes template.
* | | | Filter protocol-relative URLs in ExternalLinkFilter. Fixes issue #22742.Makoto Scott-Hinkle2016-12-211-1/+1
| | | |
* | | | Merge branch '25908-fix-grape-after-update' into 'master' Yorick Peterse2016-12-211-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Use Grape's new Route methods See merge request !8223
| * | | Use Grape's new Route methods25908-fix-grape-after-updateRémy Coutable2016-12-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use Route#request_method instead of Route#route_method - Use Route#path instead of Route#route_path Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-215-9/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070
| * | | | Improve API specsKamil Trzcinski2016-12-211-14/+18
| | | | |
| * | | | Fix a few error messagesKamil Trzcinski2016-12-202-4/+4
| | | | |
| * | | | Use separate file for error.rbKamil Trzcinski2016-12-201-2/+0
| | | | |
| * | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵Kamil Trzcinski2016-12-202-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config
| | * | | | Fix rspec tests due to different APIZ.J. van de Weg2016-12-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | * | | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵Z.J. van de Weg2016-12-202-8/+35
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into zj-mattermost-slash-config
| | * | | | | Fix rubocop errors [ci skip]Z.J. van de Weg2016-12-201-1/+1
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2015-156/+271
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Add missing Mattermost::ErrorKamil Trzcinski2016-12-201-0/+3
| | | | | | |
| * | | | | | Add with_lease to session [ci skip]Kamil Trzcinski2016-12-201-8/+32
| | |/ / / / | |/| | | |
| * | | | | WIPKamil Trzcinski2016-12-202-14/+14
| | | | | |
| * | | | | Work on tests for mattermostKamil Trzcinski2016-12-202-3/+17
| | | | | |
| * | | | | Fix Mattermost clientKamil Trzcinski2016-12-201-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-2020-43/+159
| |\ \ \ \ \
| * | | | | | Fix flowKamil Trzcinski2016-12-203-21/+46
| | | | | | |
| * | | | | | Improve sourcesKamil Trzcinski2016-12-193-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add proper error handling, - Use flash[:alert] and flash[:notice], - Use `resource` instead of `resources`,
| * | | | | | Last fixesZ.J. van de Weg2016-12-191-4/+0
| | | | | | |
| * | | | | | Merge branch 'master' into zj-mattermost-slash-configZ.J. van de Weg2016-12-1911-14/+124
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/zj-mattermost-slash-config' into ↵Z.J. van de Weg2016-12-191-3/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | zj-mattermost-slash-config
| | * | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-193-20/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Minor adjustments API MattermostZ.J. van de Weg2016-12-193-24/+17
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1844-325/+1120
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/gitlab.yml.example # lib/mattermost/session.rb # spec/lib/mattermost/session_spec.rb
| * | | | | | | | Incorporate reviewZ.J. van de Weg2016-12-161-12/+0
| | | | | | | | |
| * | | | | | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-162-7/+15
| | | | | | | | |
| * | | | | | | | Merge branch 'zj-mattermost-session' into zj-mattermost-slash-configZ.J. van de Weg2016-12-162-17/+15
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Ensure the session is destroyedZ.J. van de Weg2016-12-151-3/+5
| | | | | | | | | |
View Lorry Controller Status