- 11 Aug, 2015 23 commits
-
-
Dmitriy Zaporozhets authored
Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136
-
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
This reverts commit 7bde6ae5.
-
Dmitriy Zaporozhets authored
This reverts commit 5a1aa49b, reversing changes made to a675bea2. Signed-off-by:
-
Dmitriy Zaporozhets authored
Signed-off-by: -
Dmitriy Zaporozhets authored
This reverts commit 734a4ba8. Signed-off-by:
-
Dmitriy Zaporozhets authored
This reverts commit 27a15850. Signed-off-by:
-
Dmitriy Zaporozhets authored
This reverts commit 54113319.
-
Dmitriy Zaporozhets authored
This reverts commit 3d416f16.
-
Dmitriy Zaporozhets authored
This reverts commit 435f680b.
-
Dmitriy Zaporozhets authored
This reverts commit dfccb06d. Signed-off-by:
-
Dmitriy Zaporozhets authored
Signed-off-by: -
Dmitriy Zaporozhets authored
Signed-off-by: -
Dmitriy Zaporozhets authored
This reverts commit d24c40ec.
-
Dmitriy Zaporozhets authored
This reverts commit 459e6d34, reversing changes made to 804168e1. Signed-off-by:
-
Dmitriy Zaporozhets authored
This reverts commit 957e849f, reversing changes made to 6b9dbe9f. Signed-off-by:
-
Dmitriy Zaporozhets authored
This reverts commit 4773f38e, reversing changes made to 0d5d80b7.
-
Dmitriy Zaporozhets authored
This reverts commit 151d9fb3, reversing changes made to 819d110c.
-
Douwe Maan authored
Fix broken code import and display error messages if something went wrong with creating project Clicking "Import" in Bitbucket import status page would result in: ``` Rendered import/base/create.js.haml (38.3ms) Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms) NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>: actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url' actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path' actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for' turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer' actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to' app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' ``` Also, if the project failed to save for some reason, the user was never informed. Screenshot of new error message dump:  Closes #2241 See merge request !1134
-
Douwe Maan authored
Disable turbolinks when linking to Bitbucket import status Turbolinks was causing issues with the Bitbucket JavaScript/display because it was trying to intercept `/import/bitbucket/status` even when a 302 redirection occurred:  Closes #2241 See merge request !1131
-
Dmitriy Zaporozhets authored
Add README to list of files in project page if activity feed setting in use Closes #2044 Screenshot:  See merge request !1021
-
Stan Hu authored
Clicking "Import" in Bitbucket import status page would result in: ``` Rendered import/base/create.js.haml (38.3ms) Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms) NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>: actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url' actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path' actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for' turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer' actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to' app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700' actionview (4.1.11) lib/action_view/template.rb:145:in `block in render' activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument' actionview (4.1.11) lib/action_view/template.rb:339:in `instrument' actionview (4.1.11) lib/action_view/template.rb:143:in `render' rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method' actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template' actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument' activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument' activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument' ``` Closes #2241
-
Achilleas Pipinellis authored
Doc: Fix link to gravatar.com See merge request !1133
-
- 10 Aug, 2015 17 commits
-
-
Jan Tojnar authored
-
Achilleas Pipinellis authored
Fix instructions for empty repo + existing files Fixes #2242 See merge request !1132
-
Jeff Blaine authored
Fixes #2242
-
Stan Hu authored
Turbolinks was causing issues with the Bitbucket Javascript/display because it was trying to intercept /import/bitbucket/status even when a 302 redirection occured. Closes #2241
-
Sytse Sijbrandij (admin) authored
-
Stan Hu authored
Add dropzone upload progress to CHANGELOG This MR adds dropzone upload progress entry to CHANGELOG. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1125#note_1865958 See merge request !1130
-
Nikita Verkhovin authored
-
Douwe Maan authored
Fix diff syntax highlighting ### What does this MR do? This MR fixes a syntax highlighting issue that that manifested itself when a user tried the following: ``` +aaa +bbb ccc ``` However, a regression in 0abe98f0 caused the last line to be put on the second to last line:  Instead of this:  This bug occurred because of some error in the logic of handling new lines in the content. Refactored HTML parser to avoid duplication of newline parsing. ### What are the relevant issue numbers? Closes #2235 See merge request !1126
-
Stan Hu authored
Refactored HTML parser to avoid duplication of newline parsing. Closes #2235
-
Stan Hu authored
Closes #2044
-
Stan Hu authored
Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123
-
Dmitriy Zaporozhets authored
Improve text of MR merge widget and manual merge modal Modal with manual merge instructions:  Archived:  WIP:  Missing target branch:  Missing source branch:  Nothing to merge:  Checking ability to merge:  Conflicts when allowed to merge:  Conflicts when not allowed to merge:  Mergeable when allowed to merge:  Mergeable when not allowed to merge:  Merge in progress:  Merge failed:  Merged:  Closed:  cc @dzaporozhets @rspeicher See merge request !1120
-
Dmitriy Zaporozhets authored
Trigger post-receive hooks after commits are made by GitLab Signed-off-by: -
Dmitriy Zaporozhets authored
Fix event cache Fixes #2236. See merge request !1128
-
Dmitriy Zaporozhets authored
Signed-off-by: -
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Signed-off-by:
-
