summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge branch 'master' into mr-buildsDouwe Maan2015-12-088-56/+107
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/views/projects/merge_requests/widget/_heading.html.haml
| * | | | | | | | | | | | Make commit and MR ref filters aware of /builds pathDouwe Maan2015-12-082-1/+18
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-0837-220/+366
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement different Markdown rendering pipelines and cache Markdown Builds on !1090. Related to !1014. Fixes #2054. See merge request !1602
| * | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-084-88/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Fix RedactorFilterDouwe Maan2015-12-081-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Move CombinedPipeline methods aroundDouwe Maan2015-12-082-6/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Store the demodulized reference filter name in data attributeRobert Speicher2015-12-072-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0715-156/+265
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0219-106/+227
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Move Markdown filters and pipelines into folders.Douwe Maan2015-11-1935-46/+46
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-1967-536/+2005
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-2712-318/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Slight refactoringDouwe Maan2015-10-221-10/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use correct var nameDouwe Maan2015-10-221-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix Markdown XHTML context paramDouwe Maan2015-10-221-9/+10
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make pipelines actually make senseDouwe Maan2015-10-2114-178/+265
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-2113-60/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove unused Gitlab::Markdown#cached? methodDouwe Maan2015-10-141-5/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Cache rendered contents of issues, MRs and notesDouwe Maan2015-10-142-11/+21
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1416-7/+233
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use Gitlab::Markdown for Asciidoc and ReferenceExtractor pipelinesDouwe Maan2015-10-143-117/+154
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Enable caching of Gitlab::Markdown rendered resultDouwe Maan2015-10-142-12/+27
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Use Gitlab::Markdown.render with :pipeline option rather than different methodsDouwe Maan2015-10-145-141/+162
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Block LDAP user when they are no longer found in the LDAP serverDrew Blessing2015-12-081-1/+3
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Update project repository size and commit count during import:repos taskStan Hu2015-12-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3848
* | | | | | | | | | | | | | | | | | Merge branch 'ui/dashboard-new-issue' into 'master' Dmitriy Zaporozhets2015-12-081-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Add "New X" buttons to dashboard and group issue, MR and milestone indexes # To do - [x] Use searchable dropdown since dashboard/group can have a lot of projects. Use select2? ## Before ![Screen_Shot_2015-12-07_at_17.26.52](/uploads/22c6d6df10414f9e3e35d6cea3870486/Screen_Shot_2015-12-07_at_17.26.52.png) ## After ![Screen_Shot_2015-12-07_at_17.26.33](/uploads/02d082490ed6c83c66f052a5b601b5be/Screen_Shot_2015-12-07_at_17.26.33.png) As you can see, for milestones, groups are listed as well as we can now easily create group milestones. Fixes #3544 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2581 See merge request !1968
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ui/dashboard-new-issueui/dashboard-new-issueDouwe Maan2015-12-084-58/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into ui/dashboard-new-issueDouwe Maan2015-12-0719-191/+286
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add API group projects endpoint.Douwe Maan2015-12-071-0/+12
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'sync-all-repos' into 'master' Douwe Maan2015-12-081-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync all repos Scripts and documentation for moving repos, used on gitlab.com. See merge request !1439
| * | | | | | | | | | | | | | | | | | | Detect project and namespace changes in list:reposJacob Vosmaer2015-12-081-3/+4
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into sync-all-reposJacob Vosmaer2015-12-08118-1275/+3078
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add "rake gitlab:list_repos" taskJacob Vosmaer2015-09-251-0/+16
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rake-tasks-git' into 'master' Jacob Vosmaer2015-12-082-0/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added 3 rake tasks for repository maintainance ## What does this MR do? This MR adds 3 rake tasks - gitlab:git:repack - `-a` - `--quiet` - gitlab:git:gc - `--auto` - `--quiet` - gitlab:git:prune - Needs git version > 1.8.4.1, Ubuntu repos @ 1.9.x ## Are there points in the code the reviewer needs to double check? AFAIK this MR abides by the Guidelines for shell commands. Also, the output given is not the diskspace saved etc, just if the commands were succesfull. (Parsing output etc did not seem like the way to go) Output might be verbose when a lot of repo's are in the system? ## Why was this MR needed? `git gc` and `git prune` can reduce storage space used. ## What are the relevant issue numbers / Feature requests? Closes #1529 ## Screenshots (if relevant) `rake -T` ![Screenshot_from_2015-09-22_14-57-59](https://gitlab.com/zj/gitlab-ce/uploads/4abfa00ce7afcc73f553d92581246731/Screenshot_from_2015-09-22_14-57-59.png) (git fsck now removed as IMHO it doesn't add any value.) See merge request !1388
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into rake-tasks-gitZeger-Jan van de Weg2015-12-0726-187/+331
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into rake-tasks-gitZeger-Jan van de Weg2015-11-2440-334/+1270
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into rake-tasks-gitZeger-Jan van de Weg2015-11-1168-687/+1366
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Scalable way of requesting all reposZeger-Jan van de Weg2015-10-142-9/+16
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Added three rake tasks for repository maintainanceZeger-Jan van de Weg2015-10-142-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tasks added: gitlab:git:repack gitlab:git:gc gitlab:git:prune
* | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-omniauth-signin' into 'master' Robert Speicher2015-12-081-54/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix signin with OmniAuth providers OmniAuth CSRF protection was broken with the move to Rails 4.2 since the CSRF logic in Rails changed. This new implementation calls out to Rails instead of copying its code, which is far easier to maintain. See merge request !2019
| * | | | | | | | | | | | | | | | | | | | | | Fix signin with OmniAuth providersfix-omniauth-signinDouwe Maan2015-12-081-54/+9
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
| * | | | | | | | | | | | | | | | | | | | | Recursivity needed if a fork is a fork of a fork.Marin Jankovski2015-12-041-1/+1
| | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Inline Gitlab::Blacklist in NamespaceValidatorrs-validatorsRobert Speicher2015-12-071-34/+0
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Move EmailValidator to app/validatorsRobert Speicher2015-12-071-21/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'fix-api-private-project-update' into 'master' Dmitriy Zaporozhets2015-12-071-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API setting of 'public' attribute to false will make a project private There is a bug in the projects API where setting `public` to `false` of would not change `visibility_level` even if `visiblity_level` were not present. Closes #3864 See merge request !1996
| * | | | | | | | | | | | | | | | | | | Fix API setting of 'public' attribute to false will make a project privateStan Hu2015-12-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3864
* | | | | | | | | | | | | | | | | | | | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-071-31/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add added, modified and removed properties to commit object in webhook https://gitlab.com/gitlab-org/gitlab-ee/issues/20 See merge request !1988
| * | | | | | | | | | | | | | | | | | | fixes after reviewwebhook_payload_with_changesValery Sizov2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | |