home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,012 Commits 48 Branches 340 Tags
9faa00a7df01bd5a296ce1a325c8102ff48dc940
Commit Graph
16012 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
jubianchi 79d0b69345 Send 500 errors as JSON in the API 2015-04-27 21:27:02 +02:00
Jeroen van Baarsen fbb5a359fe Merge pull request #8754 from jirutka/fix-project_name_regex 
Fix (project_)name_regex to accept non-ASCII letters and dash
 2015-04-27 17:48:14 +02:00
Dmitriy Zaporozhets f21e269668 Fix adding new group members from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-27 18:05:51 +03:00
Jakub Jirutka a1c01bc19b Fix (project_)name_regex to accept non-ASCII letters and dash 2015-04-27 16:38:47 +02:00
Dmitriy Zaporozhets 9f443f4257 Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master' 
Fix broken file browsing with relative submodule in personal projects

Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue.

To reproduce the problem, go here:

https://gitlab.com/andrewwu.tw/submodule-test/tree/master

Closes https://github.com/gitlabhq/gitlabhq/issues/7554

See merge request !565
 2015-04-27 14:23:01 +00:00
Dmitriy Zaporozhets c1a5f4710a Merge pull request #8645 from chulkilee/hipchat-api-version 
Add api version property on hipchat service
 2015-04-27 17:07:54 +03:00
Robert Schilling bd606e3b62 Merge branch 'upgrade-dockerfile-7.10.0' into 'master' 
Upgrade Docker build to v7.10.0

See merge request !568
 2015-04-27 13:32:05 +00:00
Valery Sizov bc9ba5237c Revert "Added X-GitLab-Event header for web hooks" 
This reverts commit 548f182814.
 2015-04-27 16:29:31 +03:00
Stan Hu f50103ad7e Upgrade Docker build to v7.10.0 2015-04-27 13:24:24 +00:00
Chulki Lee 57c724558d Add api version property on hipchat service 2015-04-27 21:14:04 +09:00
Jeroen van Baarsen bb8c1cadf3 Merge pull request #9209 from Soullivaneuh/bootstrap-update 
Bootstrap 3.3.4
 2015-04-27 13:19:35 +02:00
Jeroen van Baarsen 5b69b2686f Merge pull request #9208 from Soullivaneuh/container-class 
Fix .container position on navbar
 2015-04-27 13:19:16 +02:00
Jeroen van Baarsen 365360098f Merge pull request #9207 from Soullivaneuh/x-ua-compatible 
Fix missing X-UA-Compatible meta tag
 2015-04-27 13:18:35 +02:00
Dmitriy Zaporozhets 278c3ba401 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets 2cbdfbfd1e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-27 11:38:29 +03:00
Dmitriy Zaporozhets 38e2ae5ae0 Merge pull request #8644 from Bugagazavr/hook-events 
Add X-GitLab-Event header for web hooks
 2015-04-27 11:22:33 +03:00
Dmitriy Zaporozhets 7ee1d68e0d Merge pull request #9186 from Senorsen/patch-1 
Fix contributions calendar empty problem under mysql
 2015-04-27 11:20:24 +03:00
Dmitriy Zaporozhets f3ffd7d0b1 Merge branch 'rs-capybara-screenshot' into 'master' 
Add capybara-screenshot gem

This is a handy little gem that automatically saves the page and a screenshot when a Capybara test fails to `tmp/capybara/` so you can easily see why it might have failed without adding your own `save_and_open_page` directive in the code.

Also reduces the timeout for Capybara tests when not in a CI environment.

See merge request !578
 2015-04-27 07:43:45 +00:00