| Age | Commit message (Collapse) | Author |
|---|
|
|
|
# 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
|
|
Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
|
|
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# config/routes.rb
|
|
Add Builds tab to MR detail page
## Before
## After
Fixes #3907
See merge request !2016
|
|
Update documentation about automatic issue closing
RE !1933
See merge request !2000
|
|
# Conflicts:
# app/views/projects/merge_requests/widget/_heading.html.haml
# app/views/projects/merge_requests/widget/open/_accept.html.haml
|
|
|
|
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/views/projects/merge_requests/widget/_heading.html.haml
|
|
Implement different Markdown rendering pipelines and cache Markdown
Builds on !1090.
Related to !1014.
Fixes #2054.
See merge request !1602
|
|
Languages graph
See merge request !2009
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Migrate from Sidetiq to Sidekiq-cron
Migrate from Sidetiq to Sidekiq-cron
Updated Sidekiq to 3.5.x
This will solve #2355
See merge request !1982
|
|
|
|
|
|
|
|
Two issues:
1. The constraints in the resources were incorrect. Here's what it was before:
```
group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```
In this case, id is actually the title of the milestone, which can be anything at the moment.
After:
```
group_milestone GET /groups/:group_id/milestones/:id(.:format) groups/milestones#show {:id=>/[^\/]+/, :group_id=>/[a-zA-Z.0-9_\-]+(?<!\.atom)/}
```
2. `parameterize` would strip all Unicode characters, leaving a blank string. Rails would report something like:
ActionView::Template::Error (No route matches {:action=>"show", :controller=>"groups/milestones", :group_id=>#<Group id: 48, name: "ops-dev", path: "ops-dev", owner_id: nil, created_at: "2015-11-15 08:55:30", updated_at: "2015-12-02 06:23:26", type: "Group", description: "", avatar: "sha1.c71e73d51af1865c1bbbf6208e10044d46c9bb93.png", public: false>, :id=>"", :title=>"肯定不是中文的问题"} missing required keys: [:id]):
This change uses the babosa library to create a better slug, which surprisingly
isn't actually used by the global milestone controllers. Instead, they use the
title passed as a query string for some reason.
Closes https://github.com/gitlabhq/gitlabhq/issues/9881
Fix constraints
|
|
Updated Sidekiq to 3.5.x
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Rails update to 4.2.4
https://gitlab.com/gitlab-org/gitlab-ce/issues/2694
See merge request !1902
|
|
Simplify `build_gitlab_shell_ssh_path_prefix`
See merge request !1928
|
|
|
|
|
|
|
|
|
|
If a DB migration occurs, there's a chance that the application settings are
loaded from the cache and provide stale values, causing Error 500s.
This ensures that at startup the settings are always refreshed.
Closes #3643
|
|
|
|
Added total query time to Sherlock
This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).
See merge request !1887
|
|
|
|
|
|
This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).
|
|
|
|
|
|
Lfs default and backup
Part of gitlab-org/gitlab-ce#2955
See merge request !1823
|
|
|
|
|
|
|
|
|
|
|
|
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"
This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing
changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
Reverts https://github.com/gitlabhq/gitlabhq/pull/9820
See merge request !1804
|
