3483024d93
Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'
...
Disable internal issue tracker if external tracker in use
### What does this MR do?
This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes.
### Why was this MR needed?
Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them.
### What are the relevant issue numbers?
Closes #2006
See merge request !993
2015-08-14 11:01:43 +00:00
2379057002
Provide more feedback what went wrong if HipChat service failed test
...
Issue gitlab-com/support-forum#213
2015-08-12 07:31:25 -07:00
643557dabc
Fix 404 error in files view after deleting the last file in a repository
...
Closes #1362
2015-07-21 14:12:43 -07:00
f33fe50f0d
Disable internal issue tracker if external tracker in use
...
Closes #2006
2015-07-17 22:59:31 -07:00
df2bb60f90
Add support for destroying project milestones
...
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
2015-07-17 06:54:32 -07:00
f40b99d02e
Merge branch 'master' into rubocop-for-tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/features/issues_spec.rb
spec/models/forked_project_link_spec.rb
spec/models/hooks/service_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
spec/models/project_services/hipchat_service_spec.rb
spec/requests/api/project_members_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/system_hooks_spec.rb
spec/services/archive_repository_service_spec.rb
spec/support/matchers.rb
spec/tasks/gitlab/backup_rake_spec.rb
2015-06-23 10:44:03 +02:00
359ed48638
Fix Style/AlignHash cop violations
2015-06-22 22:24:39 -07:00
bf71d53f63
Change `to_not` calls to `not_to`
...
Both work, but now we're consistent across the entire app.
2015-06-22 12:13:49 +02:00
bc027c5183
Load the Merge Request > Commits tab lazily
2015-06-17 16:59:51 -04:00
5c78d7fce8
Move Projects::MergeRequestsController spec to its correct location
2015-06-17 16:37:11 -04:00
bf4b438459
Fix bug where avatar filenames were not actually deleted from the database during removal.
...
This would result in a 404 error in certain views.
The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.
Closes #1570
2015-05-07 10:00:35 -07:00
ee92dd1683
Unescape branch names in compare commit
...
Closes #1399
Closes https://github.com/gitlabhq/gitlabhq/issues/9105
2015-04-30 12:44:46 -07:00
1615d3de39
Add tests.
2015-04-17 11:33:58 +02:00
167a6b9eef
Render a 404 when RefsController#logs_tree gets an HTML request
...
Fixes #2152
2015-04-06 23:08:28 -04:00
91761b0685
Add tests.
2015-03-31 13:37:21 +02:00
4bc5c66fe1
Fix broken `project_url` routing when protected branches are accessed with an empty repo
2015-03-01 20:26:21 -08:00
769d1ce64b
Fix spec.
2015-02-24 16:10:55 +01:00
0283fff591
Merge branch 'master' into extend_markdown_upload
...
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
2570e4df79
Fix specs.
2015-02-20 16:55:38 +01:00
d2ebdf664b
Refactor.
2015-02-17 22:23:31 +01:00
Dmitriy Zaporozhets