home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 8395b2784a Use normal font instead of strong for ci status widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:32:46 +03:00
Dmitriy Zaporozhets d390219c6f Dont show 'Remove source brnach' checkbox for fork 
Remove source button checkbox always try to remove branch in target
project. For fork source & target projects are differents - so we hide
checkbox from UI. After MR accepted you can easily remove branch with
'Remove branch' button that do remove branch call to valid project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:22:46 +03:00
Dmitriy Zaporozhets 83fd03f2dd Merge branch 'closed-in-search' into 'master' 
Fixed labels for closed issues/mr in search results

See merge request !941
 2014-07-03 18:26:37 +00:00
Dmitriy Zaporozhets 198c2e40b0 Fix labels showing if issue closed on search results page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-03 20:08:03 +03:00
Pierre de La Morinerie 6dafbf2412 Allow more mail clients to group emails by thread 
* send a 'In-Reply-To' header along the 'References' header
* subject of answers to an existing thread begins with 'Re: '
 2014-07-03 16:58:42 +02:00
Marin Jankovski 16068f3bfe Test if reopen notifications are sent. 2014-07-03 14:05:07 +02:00
Marin Jankovski 310231dbed Reopen mr email notification. 2014-07-03 13:40:21 +02:00
Dmitriy Zaporozhets e46ec91a94 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-03 13:52:00 +03:00
Dmitriy Zaporozhets dcd14c0af0 Merge branch 'no_notification_for_merger' into 'master' 
No notification for merger

Fixes #1378

See merge request !935
 2014-07-03 10:51:33 +00:00
Marin Jankovski 1208c6caa8 Notification for reopened issue. 2014-07-03 12:51:24 +02:00
Dmitriy Zaporozhets 7bff1dc92f Merge branch 'no_notification_for_project_creator' into 'master' 
No notification for project creator

Fixes #1378

See merge request !937
 2014-07-03 10:51:13 +00:00
Dmitriy Zaporozhets ebde3e35ca Merge branch 'no_need_for_creating_satellites' into 'master' 
No need for creating satellites

Satellites are created automatically now.

See merge request !905
 2014-07-03 10:47:58 +00:00
Jacob Vosmaer 4e894b1dd5 Satellites are created automatically now 2014-07-03 12:24:53 +02:00
Sytse Sijbrandij efc09c8c48 Merge branch 'use_gitlab_db_converter' into 'master' 
Use the correct clone link for the DB converter

See merge request !938
 2014-07-03 10:21:38 +00:00
Jacob Vosmaer 43b05afc4d Use the correct clone link for the DB converter 2014-07-03 12:17:46 +02:00
Marin Jankovski b048c7d24a Do not notify project owner on project creation. 2014-07-03 12:02:31 +02:00
Dmitriy Zaporozhets dbeb4d7b3a Merge pull request #7250 from ahmyi/patch-1 
Content-length for Repository Archive
 2014-07-03 11:59:25 +03:00
Marin Jankovski c3533deda1 Don't notify the user that triggered the mr notification. 2014-07-03 10:26:47 +02:00
Dmitriy Zaporozhets 8d106bed3c Reopen/close buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-03 10:48:16 +03:00
Dmitriy Zaporozhets 8031be73fe Merge branch 'contributors-api' into 'master' 
Contributors api

Fixes #1266

See merge request !934
 2014-07-03 07:28:02 +00:00
Dmitriy Zaporozhets efc6baf782 Merge branch 'fix-snippet-comments' into 'master' 
Fix snippet comments

Also fixes #1209

See merge request !936
 2014-07-03 05:58:59 +00:00
ahmyi 4d051e987f Archive with content-length header 2014-07-03 11:05:51 +08:00
ahmyi dce6cb2d84 Content-length defined in header response 
Enable Content-Length to be defined in header response
 2014-07-03 10:57:01 +08:00
Marin Jankovski f50c7ecadc Remove new lines. 2014-07-02 19:09:27 +02:00
Dmitriy Zaporozhets 3decd46269 Better UI for closed/reopen buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 20:05:36 +03:00
Dmitriy Zaporozhets 75e903c08b Fix project snippet comments loading 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 19:53:41 +03:00
Dmitriy Zaporozhets 8fcdd6bfaf Merge branch 'no_pg_socket' into 'master' 
Remove 'socket' example PostgreSQL parameter
 2014-07-02 16:25:45 +00:00
Dmitriy Zaporozhets a27c336ec8 Merge branch 'assignement_change_notifications' into 'master' 
Assignment change notifications

Fixes #1377
 2014-07-02 16:25:17 +00:00
Dmitriy Zaporozhets 30b729195b Merge branch 'reference_merge_request_in_commit_message' into 'master' 
Add reference to the merge request in the default merge request commit message

This adds a link to the merge request to the merge request commit.

If merge requests are used for code review, the merge in git is now linked to the code review.

See http://feedback.gitlab.com/forums/176466-general/suggestions/6088000-in-the-default-merge-request-commit-message-add-a
 2014-07-02 16:22:08 +00:00
Dmitriy Zaporozhets dacf9f9f86 Add contributors API docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 19:17:56 +03:00
Marin Jankovski bc7656a306 Do not notify person who merged the MR. 2014-07-02 16:38:03 +02:00
Marin Jankovski 12f696c23e Remove unecessary return. 2014-07-02 16:02:26 +02:00
Dmitriy Zaporozhets 767bd78081 Use Contributor class instead of hash 2014-07-02 15:09:06 +03:00
Dmitriy Zaporozhets 5a88873e5c Move API contributors logic to repository model 2014-07-02 14:43:23 +03:00
Marin Jankovski 8a365f5d56 Fix tests because previous assignee didn't exist. 2014-07-02 13:32:53 +02:00
Marin Jankovski 39f82b75f5 When assigning an unassigned issue send notification with the correct text. 2014-07-02 11:55:05 +02:00
Dmitriy Zaporozhets 81d41c0f92 Collect contributors info via API 2014-07-02 12:40:20 +03:00
Dmitriy Zaporozhets 119b02877d Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master' 
Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed

This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed.
 2014-07-02 07:00:16 +00:00
Dmitriy Zaporozhets 54e69988a5 Merge branch 'fix-stale-gemfile-comment' into 'master' 
Remove stale comment in Gemfile

The comment was added in a91a6491bf, and referred to the below gem `grape-entity` being pulled directly from a Git repo. The `gem` command has already been changed to pull directly from Rubygems, so the comment is no longer necessary.
 2014-07-02 06:59:05 +00:00
Dmitriy Zaporozhets e91bc1961f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-02 09:57:54 +03:00
Dmitriy Zaporozhets d35a99e6cb Merge pull request #7204 from cirosantilli/user-validation-msg 
Fix username validation message to match regexp.
 2014-07-02 09:57:14 +03:00
Dmitriy Zaporozhets f3b31c4c5b Merge pull request #6629 from sykano/fix-project-limit-for-groups 
fix for project creation: group projects don't count towards user's project limit
 2014-07-02 09:56:24 +03:00
Dmitriy Zaporozhets 2e3818f14f Add contributors API endpoint 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-02 09:49:10 +03:00
Dmitriy Zaporozhets 35c9af460d Merge branch 'better-location-for-signin-disable' into 'master' 
Better location for signin disable

Make it easier for people to find these settings where they are expected, under auth settings.
 2014-07-02 06:17:04 +00:00
Christian Taedcke c1b7e904ff Add a mention of the merge request into its default commit message. 2014-07-01 21:54:19 +02:00
Rory O’Kane 0b55b4768f Remove stale comment in Gemfile 
The comment was added in a91a6491bf, and referred to the below gem `grape-entity` being pulled directly from a Git repo. The `gem` command has already been changed to pull directly from Rubygems, so the comment is no longer necessary.
 2014-07-01 13:24:40 -04:00
Jacob Vosmaer 6b101abaef Remove 'socket' example PostgreSQL parameter 
The ActiveRecord PostgreSQL adapter does not have a 'socket' option;
see:

https://github.com/rails/rails/blob/4-1-2/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L20
 2014-07-01 18:27:50 +02:00
Sytse Sijbrandij e12a517e83 Improve the documentation of the signup item, password items is outdated now since people are used to the behaviour. 2014-07-01 16:20:07 +02:00
Kyle Fazzari 1f976a646d Updated ATOM feed partials to use markdown instead of simple_format. 2014-07-01 06:29:58 -07:00
Dmitriy Zaporozhets 4e1f9e2b8b Merge branch 'issue_strong_param' into 'master' 
Issue strong param

Fixes #1390
 2014-07-01 13:01:42 +00:00