summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch 'upgrader-7.10.1' into 'master'Douwe Maan2015-04-301-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update upgrader doc to point to 7.10.1. See merge request !594
| | * | | | | | | | | | Update upgrader doc to point to 7.10.1.Douwe Maan2015-04-301-3/+3
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'fix-project-tags' into 'master'Douwe Maan2015-04-308-2/+76
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix DB error when trying to tag a repository Steps to reproduce: Go to a project settings, add tags, click on save changes Observed behavior: Error 500 ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. * Closes #1512 * Closes #1550 * Closes https://github.com/gitlabhq/gitlabhq/issues/6867 * Closes https://github.com/gitlabhq/gitlabhq/issues/9194 See merge request !577
| | * | | | | | | | | Fix DB error when trying to tag a repositoryStan Hu2015-04-278-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upon tagging a repository, an error due to a missing migration occurred: ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. Closes #1512 Closes https://github.com/gitlabhq/gitlabhq/issues/6867 Closes https://github.com/gitlabhq/gitlabhq/issues/9194
| * | | | | | | | | | Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-306-10/+49
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | Show incompatible projects in Google Code import statusStan Hu2015-04-306-10/+49
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge pull request #8669 from robotroll/patch-1Jeroen van Baarsen2015-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Update 7.6-to-7.7.md
| * | | | | | | | | Fix link to gitlab.yml.example in paragraph 5Robin Gauß2015-04-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-submodule-error-with-forked-project' into 'master'Dmitriy Zaporozhets2015-04-307-12/+80
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Fix "Revspec not found" errors when viewing diffs in a forked project with ↵Stan Hu2015-04-277-12/+80
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodules Closes #1413
* | | | | | | | | | Merge branch 'Soullivaneuh-show-aside'Dmitriy Zaporozhets2015-04-3010-19/+22
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into ↵Dmitriy Zaporozhets2015-04-3010-19/+22
| |\ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Soullivaneuh-show-aside
| * | | | | | | | | | Fix wrong placement of show-aside linkSullivan SENECHAL2015-04-2710-19/+22
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-308-7/+73
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'wip-means-no-mr' into 'master'Dmitriy Zaporozhets2015-04-308-7/+73
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-308-7/+73
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #9232 from jverdeyen/hotfix/upgrade_docs_typoJeroen van Baarsen2015-04-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | Update 7.9-to-7.10.md
| | * | | | | | | | | | Update 7.9-to-7.10.mdJoeri Verdeyen2015-04-301-2/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-04-3022-282/+243
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/_head_panel.html.haml
| * | | | | | | | | | Merge branch 'search-layout' into 'master'Dmitriy Zaporozhets2015-04-2916-133/+161
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to search layout Improve search layout to match new UI style and make it more mobile-firendly See merge request !585
| | * | | | | | | | | | Fix testsDmitriy Zaporozhets2015-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | Move search categories (projects, issues etc) below search field. Instead ↵Dmitriy Zaporozhets2015-04-298-81/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use sidebar for dashbaord nav Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | Continue refactoring and restyle of search layoutDmitriy Zaporozhets2015-04-2810-70/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | Draft improvements to search layoutDmitriy Zaporozhets2015-04-2811-115/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Fix visibility settings UI in admin areaDmitriy Zaporozhets2015-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-295-148/+80
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'footnotes-markdown' into 'master'Douwe Maan2015-04-292-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add footnotes support to Markdown This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555 See merge request !572
| | | * | | | | | | | | | | Add footnotes support to MarkdownGuillaume Delbergue2015-04-242-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Guillaume Delbergue <guillaume.delbergue@greensocs.com>
| | * | | | | | | | | | | | Merge branch 'refactor-service-settings' into 'master'Douwe Maan2015-04-293-147/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | Move service template and project service settings into a shared viewStan Hu2015-04-293-147/+77
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'Add_phrase_close_multiple_issues' into 'master'Sytse Sijbrandij2015-04-291-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | Added phrase "Here's how to close multiple issues in one commit message" so ↵Karen Carias2015-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that doc is easier to find by users
* | | | | | | | | | | | | | Merge branch 'Soullivaneuh-container-class-reloaded'Dmitriy Zaporozhets2015-04-306-80/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'container-class-reloaded' of ↵Dmitriy Zaporozhets2015-04-306-80/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-container-class-reloaded
| * | | | | | | | | | | | | Fix .container position on navbar (reloaded)Sullivan SENECHAL2015-04-296-80/+73
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix_data' into 'master'Dmitriy Zaporozhets2015-04-292-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove abandoned GroupMembers https://dev.gitlab.org/gitlab/gitlabhq/issues/2270#note_43457 See merge request !1802
| * | | | | | | | | | | | | Remove abandoned GroupMembersValery Sizov2015-04-292-1/+7
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-292-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #9220 from kylekatarnls/patch-1Jeroen van Baarsen2015-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9219 Affix menu size change
| | * | | | | | | | | | | | | Fix #9219 Affix menu size changeKyle2015-04-291-1/+1
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #8677 from jubianchi/api-500-jsonJeroen van Baarsen2015-04-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | Send 500 errors as JSON in the API
| | * | | | | | | | | | | | Send 500 errors as JSON in the APIjubianchi2015-04-271-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-04-293-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'fix-commit-data-url-generation' into 'master'Douwe Maan2015-04-283-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 (76aad9b76ed) 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
| | * | | | | | | | | | | | Fix bug where commit data would not appear in some subdirectoriesStan Hu2015-04-263-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459
* | | | | | | | | | | | | | Revert "Fix '.container or .container-fluid should be the first child inside ↵Dmitriy Zaporozhets2015-04-291-2/+2
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of a .navbar' issue" This reverts commit 570594a469fe481060d312d9d90980c5f9289e2f.
* | | | | | | | | | | | | Merge branch 'rs-issue-2269' into 'master'Dmitriy Zaporozhets2015-04-286-52/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
| * | | | | | | | | | | | | Specs don't need to set default_url_options anymoreRobert Speicher2015-04-272-18/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Set default_url_options in test environments tooRobert Speicher2015-04-251-11/+9
| | | | | | | | | | | | | |