Commit Graph
16032 Commits
Author SHA1 Message Date
Stan Hu 4dda17a5bf Make Reply-To config apply to change e-mail confirmation and other notifications
sent through Devise

Fix test case that was passing due to a broken `around` statement.

Closes #1556
2015-05-01 22:57:10 -07:00
Douwe Maan 001c9731e6 Merge branch 'upgrader-7.10.1' into 'master'
Update upgrader doc to point to 7.10.1.

See merge request !594
2015-04-30 20:15:22 +00:00
Douwe Maan cb40918930 Update upgrader doc to point to 7.10.1. 2015-04-30 22:14:19 +02:00
Douwe Maan 2f4426b7e4 Merge branch 'fix-project-tags' into 'master'
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
2015-04-30 17:20:36 +00:00
Douwe Maan f2cf6d75ec Merge branch 'show-invalid-projects-google-code-import' into 'master'
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
2015-04-30 17:08:45 +00:00
Dmitriy Zaporozhets 6d22e96744 Merge branch 'fix-submodule-error-with-forked-project' into 'master'
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
2015-04-30 16:47:35 +00:00
Dmitriy Zaporozhets a06354485c Merge branch 'Soullivaneuh-show-aside' 2015-04-30 19:40:45 +03:00
Dmitriy Zaporozhets 93359c7e06 Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside 2015-04-30 19:40:05 +03:00
Dmitriy Zaporozhets 26c62cb036 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-30 19:38:25 +03:00
Dmitriy Zaporozhets c93020c47f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-30 19:37:31 +03:00
Dmitriy Zaporozhets 32d7841b2c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/_head_panel.html.haml
2015-04-30 19:36:45 +03:00
Dmitriy Zaporozhets 86b752e0cf Merge branch 'Soullivaneuh-container-class-reloaded' 2015-04-30 19:34:12 +03:00
Dmitriy Zaporozhets ac5f9ff408 Merge branch 'container-class-reloaded' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-container-class-reloaded 2015-04-30 19:34:07 +03:00
Dmitriy Zaporozhets 9faa00a7df Merge branch 'wip-means-no-mr' into 'master'
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
2015-04-30 15:20:16 +00:00
Jeroen van Baarsen 9a90eea768 Merge pull request #9232 from jverdeyen/hotfix/upgrade_docs_typo
Update 7.9-to-7.10.md
2015-04-30 16:23:35 +02:00
Stan Hu 9c76a6fa96 Show incompatible projects in Google Code import status
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
2015-04-30 06:56:49 -07:00
Douwe Maan 7e0eb486ed Don't allow a merge request to be merged when its title starts with "WIP". 2015-04-30 15:46:36 +02:00
Joeri Verdeyen 81f6495858 Update 7.9-to-7.10.md 2015-04-30 13:22:28 +02:00
Dmitriy Zaporozhets 39a55bdf1a Merge branch 'search-layout' into 'master'
Improvements to search layout

Improve search layout to match new UI style and make it more mobile-firendly

See merge request !585
2015-04-29 18:40:16 +00:00
Dmitriy Zaporozhets 5bf9f69df7 Fix visibility settings UI in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-29 20:32:48 +03:00
Dmitriy Zaporozhets 4636c1ddac Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-29 20:27:06 +03:00
Douwe Maan 1a6d886e0d Merge branch 'footnotes-markdown' into 'master'
Add footnotes support to Markdown

This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555

See merge request !572
2015-04-29 17:17:20 +00:00
Douwe Maan 5d5e746767 Merge branch 'refactor-service-settings' into 'master'
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
2015-04-29 17:16:21 +00:00
Dmitriy Zaporozhets 7534d0ef46 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-29 19:52:25 +03:00
Sytse Sijbrandij f75eeff5a1 Merge branch 'Add_phrase_close_multiple_issues' into 'master'
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
2015-04-29 16:45:18 +00:00
Stan Hu 808b05e974 Move service template and project service settings into a shared view 2015-04-29 07:52:27 -07:00
Dmitriy Zaporozhets 8d3eaf5fa1 Merge branch 'fix_data' into 'master'
Remove abandoned GroupMembers

https://dev.gitlab.org/gitlab/gitlabhq/issues/2270#note_43457

See merge request !1802
2015-04-29 11:27:42 +00:00
Valery Sizov 4d3a93af2d Remove abandoned GroupMembers 2015-04-29 13:46:57 +03:00
Sullivan SENECHAL 2b0a1ca013 Fix .container position on navbar (reloaded) 2015-04-29 12:42:39 +02:00
Dmitriy Zaporozhets 18a9151bf6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-29 12:26:44 +03:00
Dmitriy Zaporozhets 332a17cf42 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-04-29 12:25:46 +03:00
Dmitriy Zaporozhets acad85459f Revert "Fix '.container or .container-fluid should be the first child inside of a .navbar' issue"
This reverts commit 570594a469.
2015-04-29 12:24:54 +03:00
Dmitriy Zaporozhets 24037e7e63 Move search categories (projects, issues etc) below search field. Instead use sidebar for dashbaord nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-29 12:19:54 +03:00
Jeroen van Baarsen ac8f1ba876 Merge pull request #9220 from kylekatarnls/patch-1
Fix #9219 Affix menu size change
2015-04-29 10:45:05 +02:00
Karen Carias a8956e8850 Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users 2015-04-28 23:45:44 +00:00
Kyle 981c3c303f Fix #9219 Affix menu size change 2015-04-29 00:06:48 +02:00
Dmitriy Zaporozhets 1ff01d26e1 Continue refactoring and restyle of search layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-28 22:04:19 +03:00
Jeroen van Baarsen 285cf3f772 Merge pull request #8677 from jubianchi/api-500-json
Send 500 errors as JSON in the API
2015-04-28 18:03:34 +02:00
Douwe Maan 822ba95f75 Merge branch 'fix-commit-data-url-generation' into 'master'
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 (76aad9b76e) 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
2015-04-28 15:46:36 +00:00
Dmitriy Zaporozhets d5fe1e57d5 Draft improvements to search layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-04-28 12:48:42 +03:00
Dmitriy Zaporozhets 8140c68289 Merge branch 'rs-issue-2269' into 'master'
Remove duplicate settings for default_url_options

Closes #2269

See merge request !1797
2015-04-28 08:34:34 +00:00
Dmitriy Zaporozhets f0227d761f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-28 11:32:37 +03:00
Dmitriy Zaporozhets 2940de43a5 Merge branch 'admin-add-group-members' into 'master'
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
2015-04-28 08:31:48 +00:00
Jeroen van Baarsen f93616d62b Merge pull request #8680 from jubianchi/dev-rerun-foreman
Add a rake task to automatically restart foreman when changes occur
2015-04-28 09:41:28 +02:00
Sytse Sijbrandij c505eda3e8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-27 23:10:10 -07:00
Sytse Sijbrandij d7062d5ef6 Merge branch 'docker-improvements' into 'master'
Add more instructions on how to publish docker images yourself.

See merge request !1800
2015-04-28 06:09:47 +00:00
Sytse Sijbrandij f476888e77 Add more instuctions on how to publish docker images yourself. 2015-04-27 23:09:03 -07:00
Stan Hu 72a7febead Fix "Revspec not found" errors when viewing diffs in a forked project with submodules
Closes #1413
2015-04-27 20:42:38 -07:00
Robert Speicher e3d2304d69 Specs don't need to set default_url_options anymore 2015-04-27 15:47:05 -04:00
jubianchi 3070b2cfc7 Add a rake task to automatically restart foreman when changes occur 2015-04-27 21:32:41 +02:00