summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-107-34/+107
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb
| * Allow [Symbol] when loading YAML Kamil Trzciński2015-12-091-2/+2
| |
| * Use YAML.safe_loadKamil Trzciński2015-12-091-2/+2
| |
| * Merge branch 'master' into split-up-buildsDouwe Maan2015-12-092-28/+37
| |\
| | * Merge branch 'master' into merge-if-greenDouwe Maan2015-12-092-1/+18
| | |\ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # config/routes.rb
| | * \ Merge branch 'master' into merge-if-greenDouwe Maan2015-12-087-55/+106
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml
| | * \ \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-1/+1
| | |\ \ \
| | * \ \ \ Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-085-89/+12
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0737-282/+553
| | |\ \ \ \ \
| | * | | | | | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-022-14/+9
| | | | | | | |
| | * | | | | | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-23/+13
| | | | | | | |
| | * | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1864-524/+1964
| | |\ \ \ \ \ \
| | * | | | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-181-22/+46
| | | | | | | | |
| * | | | | | | | Split up spec:other even moreDouwe Maan2015-12-091-1/+19
| | | | | | | | |
| * | | | | | | | Fix rspec tag syntaxDouwe Maan2015-12-091-1/+1
| | | | | | | | |
| * | | | | | | | Split up specs moreDouwe Maan2015-12-091-1/+10
| | | | | | | | |
| * | | | | | | | Split up feature specs moreDouwe Maan2015-12-091-3/+23
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Move Builds tab to the endDouwe Maan2015-12-081-2/+2
| | | | | | | |
| * | | | | | | 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
| | | | | | | | | | | | | | |
View Lorry Controller Status