- 30 Apr, 2015 15 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
Show incompatible projects in Google Code import status Using Google Code import with a JSON file that contained only one Subversion project led to confusion over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion. Closes #1531 ## Screenshots Before: ![Screen_Shot_2015-04-29_at_12.46.41_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/16ea5a99cbace48cd2f2c238b5f73f4e/Screen_Shot_2015-04-29_at_12.46.41_AM.png) After with no projects available (notice the button is hidden): ![Screen_Shot_2015-04-30_at_1.34.38_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/43c612cdcbab181713e5764e2f38a04e/Screen_Shot_2015-04-30_at_1.34.38_AM.png) After with 1 valid and 1 incompatible project: ![Screen_Shot_2015-04-30_at_1.37.26_AM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5bcbd304206a996932e5208ef54a071/Screen_Shot_2015-04-30_at_1.37.26_AM.png) See merge request !586
-
Dmitriy Zaporozhets authored
Fix "Revspec not found" errors when viewing diffs in a forked project with submodules ## What does this MR do? This MR fixes an error that occurs when viewing diffs in a forked project with submodules. ### Are there points in the code the reviewer needs to double check? Testing this code was tricky. The only way this problem shows up is if the origin project does NOT have the submodule update commit. The introduction of gitlab-test-fork serves that purpose: it contains a submodule update not present in gitlab-test. ### Why was this MR needed? A user would receive a 500 error when trying to view a merge request with a submodule update. #1413 has details on how to reproduce this issue. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1413 See merge request !512
-
Dmitriy Zaporozhets authored
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/_head_panel.html.haml
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Merge branch 'container-class-reloaded' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-container-class-reloaded
-
Dmitriy Zaporozhets authored
Don't allow a merge request to be merged when its title starts with "WIP". Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2078 ![Screen_Shot_2015-04-30_at_15.47.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9035743e6f482a9c31cf86d84388074c/Screen_Shot_2015-04-30_at_15.47.03.png) See merge request !590
-
Jeroen van Baarsen authored
Update 7.9-to-7.10.md
-
Stan Hu authored
Importing a JSON file with only one Subversion project lead to confusion over whether the system was working. Provide status why these projects could not be imported directly. Closes #1531
-
Douwe Maan authored
-
Joeri Verdeyen authored
-
- 29 Apr, 2015 16 commits
-
-
Dmitriy Zaporozhets authored
Improvements to search layout Improve search layout to match new UI style and make it more mobile-firendly See merge request !585
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
-
Douwe Maan authored
Add footnotes support to Markdown This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555 See merge request !572
-
Douwe Maan authored
Move service template and project service settings into a shared view This MR reconciles the small differences in the error message layout between the template and project settings, and moves the partial into a shared view. This came from a mention in https://github.com/gitlabhq/gitlabhq/issues/9181 to take care of this. See merge request !588
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Sytse Sijbrandij authored
Add phrase "Here's how to close multiple issues in one commit message" Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users. cc/ @sytse See merge request !1801
-
Stan Hu authored
-
Dmitriy Zaporozhets authored
Remove abandoned GroupMembers https://dev.gitlab.org/gitlab/gitlabhq/issues/2270#note_43457 See merge request !1802
-
Valery Sizov authored
-
Sullivan SENECHAL authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
This reverts commit 570594a4.
-
Dmitriy Zaporozhets authored
Move search categories (projects, issues etc) below search field. Instead use sidebar for dashbaord nav Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Jeroen van Baarsen authored
Fix #9219 Affix menu size change
-
- 28 Apr, 2015 9 commits
-
-
Karen Carias authored
Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users
-
Kyle authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Jeroen van Baarsen authored
Send 500 errors as JSON in the API
-
Douwe Maan authored
Fix bug where commit data would not appear in some subdirectories Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example: https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix) The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b7) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior. * Closes #1478, #1459 * Closes https://github.com/gitlabhq/gitlabhq/issues/9037 See merge request !581
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Fix adding new group members from admin area Fix for #2222 Tests for this case already exists but it was green. It related to current way dealing with ajax selectbox. Improving tests might be a reason for another merge requests - everyone is welcome to participate. See merge request !1796
-