Gabriel Mazetto
3e5b24d46a
Upgraded Sidekiq to 4.x
2015-12-10 17:18:03 -02:00
Douwe Maan
10387f6b8a
Merge branch 'master' into tmp-reference-pipeline-and-caching
...
# 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
2015-12-10 14:04:34 +01:00
Drew Blessing
f4ec906e90
Use devise paranoid mode and ensure the same message is returned every time
...
Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
2015-12-09 18:40:37 -06:00
Douwe Maan
eab086bde1
Merge branch 'master' into merge-if-green
...
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# config/routes.rb
2015-12-09 09:00:25 +01:00
Dmitriy Zaporozhets
6213263d32
Merge branch 'mr-builds' into 'master'
...
Add Builds tab to MR detail page
## Before
## After
Fixes #3907
See merge request !2016
2015-12-09 00:05:23 +00:00
Robert Speicher
275e8e7309
Merge branch 'issue-closing-docs' into 'master'
...
Update documentation about automatic issue closing
RE !1933
See merge request !2000
2015-12-08 22:03:07 +00:00
Douwe Maan
8fb49a4b70
Merge branch 'master' into merge-if-green
...
# Conflicts:
# app/views/projects/merge_requests/widget/_heading.html.haml
# app/views/projects/merge_requests/widget/open/_accept.html.haml
2015-12-08 22:34:03 +01:00
Douwe Maan
23b6a98de0
Move Builds tab to the end
2015-12-08 22:28:28 +01:00
Douwe Maan
6c94a44295
Merge branch 'master' into mr-builds
...
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/views/projects/merge_requests/widget/_heading.html.haml
2015-12-08 22:26:29 +01:00
Robert Speicher
bcd89a58e7
Merge branch 'reference-pipeline-and-caching' into 'master'
...
Implement different Markdown rendering pipelines and cache Markdown
Builds on !1090 .
Related to !1014 .
Fixes #2054 .
See merge request !1602
2015-12-08 20:22:23 +00:00
Robert Speicher
befff32ecb
Merge branch 'languages-graph' into 'master'
...
Languages graph
See merge request !2009
2015-12-08 16:56:39 +00:00
Douwe Maan
41a4785b85
Fix signin with OmniAuth providers
2015-12-08 14:58:15 +01:00
Douwe Maan
75486f09c4
Merge branch 'master' into zj/gitlab-ce-merge-if-green
2015-12-08 13:43:45 +01:00
Douwe Maan
926c3bef9f
Merge branch 'master' into reference-pipeline-and-caching
2015-12-08 13:40:32 +01:00
Douwe Maan
1567572e79
Add Builds tab to MR detail page
2015-12-08 13:11:41 +01:00
Douwe Maan
048605bd33
Merge branch 'master' into issue-closing-docs
2015-12-08 12:47:09 +01:00
Dmitriy Zaporozhets
9b561e7e15
Implement languages graph page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-12-08 02:35:34 +01:00
Dmitriy Zaporozhets
1da71fa9ed
Merge branch 'feature/sidekiq-cron' into 'master'
...
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
2015-12-07 18:53:59 +00:00
Douwe Maan
d611a38798
Merge branch 'master' into reference-pipeline-and-caching
2015-12-07 14:48:53 +01:00
Douwe Maan
a426fb1596
Update documentation about automatic issue closing
2015-12-07 14:11:13 +01:00
Zeger-Jan van de Weg
0e96d6eb10
Merge branch 'master' into merge-if-green
2015-12-07 10:06:07 +01:00
Stan Hu
d800a949d2
Fix Error 500 when creating global milestones with Unicode characters
...
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
2015-12-05 00:04:44 -08:00
Gabriel Mazetto
496870ddec
Migrate from Sidetiq to Sidekiq-cron
...
Updated Sidekiq to 3.5.x
2015-12-04 11:29:45 -02:00
Douwe Maan
0dcff1342b
Merge branch 'master' into reference-pipeline-and-caching
2015-12-03 13:34:25 +01:00
Douwe Maan
928d131e39
Merge branch 'master' into link-refs
2015-12-03 13:32:42 +01:00
Valery Sizov
f21bbd4444
Rails deprecation warning about log_level
2015-12-03 10:53:58 +02:00
Douwe Maan
60828ab40e
Merge branch 'master' into link-refs
2015-12-02 12:12:03 +01:00
Douwe Maan
2955ca613b
Merge branch 'master' into reference-pipeline-and-caching
2015-12-02 11:20:51 +01:00
Douwe Maan
f9017a2b03
Have ClosingIssueExtractor recognize all referenced issues
2015-11-30 21:36:35 +01:00
Valery Sizov
e0131c5d07
Merge branch 'rails_update_to_4_2' into 'master'
...
Rails update to 4.2.4
https://gitlab.com/gitlab-org/gitlab-ce/issues/2694
See merge request !1902
2015-11-30 16:49:09 +00:00
Douwe Maan
a8e05cec00
Merge branch 'rs-build-ssh-path-prefix' into 'master'
...
Simplify `build_gitlab_shell_ssh_path_prefix`
See merge request !1928
2015-11-30 13:15:21 +00:00
Valery Sizov
461731f076
fix notification_service specs
2015-11-30 11:21:10 +02:00
Robert Speicher
e1522ec855
Simplify build_gitlab_shell_ssh_path_prefix
2015-11-29 17:52:40 -05:00
Stan Hu
78c1ab40e2
Gracefully handle when Redis is not available
2015-11-26 07:55:21 -08:00
Valery Sizov and Valery Sizov
7f214cee74
Migrate mailers to ActiveJob
2015-11-26 17:03:43 +02:00
Stan Hu
e55473ad68
Expire application settings from cache at startup
...
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
2015-11-25 11:30:33 -08:00
Valery Sizov
40ff1318d2
Rails update to 4.2.4
2015-11-25 18:18:44 +02:00
Yorick Peterse
ef2bc0f0bf
Merge branch 'sherlock-total-query-time' into 'master'
...
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
2015-11-25 11:29:48 +00:00
Marin Jankovski
0985032132
Also fallback to a default value if none is set.
2015-11-24 15:57:28 +01:00
Marin Jankovski
9595ec036a
Maybe rescue session_expire_delay by setting a default value.
2015-11-24 12:11:31 +01:00
Yorick Peterse
97f8c6279f
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).
2015-11-24 10:57:21 +01:00
Kamil Trzcinski
11728b50f9
Expose artifacts path
2015-11-23 13:05:22 +01:00
Zeger-Jan van de Weg
8608c6325e
Refactor MergeWhenBuildSucceedsService and incorporate feedback
2015-11-23 10:11:54 +01:00
Dmitriy Zaporozhets
b96fa3094a
Merge branch 'lfs_default_and_backup' into 'master'
...
Lfs default and backup
Part of gitlab-org/gitlab-ce#2955
See merge request !1823
2015-11-20 09:10:27 +00:00
Douwe Maan
f5a630111f
Merge branch 'master' into reference-pipeline-and-caching
2015-11-19 15:46:04 +01:00
Marin Jankovski
060e59f054
Lfs on by default.
2015-11-19 10:42:46 +01:00
Valery Sizov
fd2c0fe446
award emoji
2015-11-19 01:25:27 +02:00
Zeger-Jan van de Weg
53b285c9a8
Merge branch 'master' into merge-if-green
2015-11-18 11:58:01 +01:00
Zeger-Jan van de Weg
2f048df4a4
API support, incorporated feedback
2015-11-18 11:17:41 +01:00
Robert Speicher
df0110ba81
Merge branch 'rs-revert-gh-9820' into 'master'
...
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"
This reverts commit 63144cd0628ab5df9d87https://github.com/gitlabhq/gitlabhq/pull/9820
See merge request !1804
2015-11-17 15:09:22 +00:00
Gabriel Mazetto
Douwe Maan
Drew Blessing
Dmitriy Zaporozhets
Robert Speicher
Zeger-Jan van de Weg
Stan Hu
Gabriel Mazetto
Valery Sizov
Valery Sizov
Robert Speicher
Yorick Peterse
Marin Jankovski
Kamil Trzcinski