home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,298 Commits 48 Branches 340 Tags
2a52be9c3ebedcc8c512f64bb8cccdeebd15dd8a
Commit Graph
1424 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets e44e2316c3 Change gravatar tests to identicon 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-17 09:40:48 +03:00
Alex Elman e6722cb178 Provide better email subject lines from email on push service 
If one commit is pushed, display the commit message in the subject
line. Otherwise display the number of commits pushed to the repository.
 2014-06-15 09:53:00 -05:00
Dmitriy Zaporozhets 869809a1cf Remove failing test on travis+pg 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:41:32 +03:00
Dmitriy Zaporozhets 49506fc71a Merge remote-tracking branch 'origin/issue_closing_widget' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-06-14 12:40:42 +03:00
Dmitriy Zaporozhets 55d4e2647d Merge branch 'ce_issues_sentence' into 'master' 
Issues sentence helper

This will make merging CE into EE later easier.
 2014-06-14 09:39:19 +00:00
Dmitriy Zaporozhets 47d6f70528 Add /api/users test for admin role. Updated CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 19:42:17 +03:00
Dmitriy Zaporozhets 8ff171f628 Fix api specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 19:39:12 +03:00
Dmitriy Zaporozhets e8f222e39c Fix helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 19:35:21 +03:00
Jacob Vosmaer d698535854 Add a test for issue sentence generation 2014-06-13 18:10:28 +02:00
Jacob Vosmaer 3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00
Dmitriy Zaporozhets ae564c97d4 Dont expose user email via API 
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets d593c98fcb Delete wall notes tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:29:26 +03:00
Dmitriy Zaporozhets 1d7735773e Merge branch 'email_with_apostrophe' into 'master' 
Email with apostrophe

Fixes #1225
 2014-06-11 12:15:01 +00:00
Dmitriy Zaporozhets f881e43677 Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard 
links to issues on main dashboard
 2014-06-11 15:02:48 +03:00
Marin Jankovski f43e41973f Test for the apostrophe in the email 2014-06-11 13:36:30 +02:00
Marvin Frick 587502390b fixes gitlab.com issue #229 
Changes .js.coffe files to not use a hardcoded path to
`no_avatar.png` but instead stick with the asset pipeline.

renames coffee.erb back to coffee
 2014-06-10 22:28:11 +02:00
Pierre de La Morinerie de90b572d8 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: ’

This fixes threading with at least Mail.app and Airmail.
 2014-06-10 17:09:15 +02:00
Pierre de La Morinerie 466b768bb3 Send notification emails to the "project", and put people in Cc 
This fixes email threading in Mail.app, that doesn't like when a thread
doesn't have stable recipients.

For instance, here is a possible sender-recipient combinations before:

From: A
To: Me
New issue

From: B
To: Me
Reply on new issue

From: A
To: Me
Another reply

Mail.app doesn't see B as a participant to the original email thread,
and decides to break the thread: it will group all messages from A
together, and separately all messages from B.

This commit makes the thread look like this:

From: A
To: gitlab/project
Cc: Me
New issue

From: B
To: gitlab/project
Cc: Me
Reply on new issue

From: A
To: gitlab/project
Cc: Me
Another reply

Mail.app sees a common recipient, and group the thread correctly.
 2014-06-10 17:09:15 +02:00
Dmitriy Zaporozhets f2353352a2 Test for milestone changed comment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 12:39:48 +03:00
Dmitriy Zaporozhets f055bad513 Merge pull request #7095 from jvanbaarsen/routing-spec-fix 
Fix for the broken routing specs
 2014-06-09 12:26:46 +03:00
Dmitriy Zaporozhets 9e78fb5bf7 Merge pull request #7094 from jvanbaarsen/project-team-spec-fix 
Fixed the project team specs
 2014-06-09 12:26:32 +03:00
Jeroen van Baarsen f07f524bad Fix for the broken routing specs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-08 23:42:09 +02:00
Jeroen van Baarsen a705d194fa Fixed the project team specs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-08 23:36:09 +02:00
Jeroen van Baarsen 597836d6cc Fixed some broken specs 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-08 23:27:57 +02:00
Jeroen van Baarsen 2838a993da DB cleaner reverted to a known working version 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-07 10:09:56 +02:00
Jeroen van Baarsen 7cf1a4259a Disable fixtures 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-06 19:55:49 +02:00
Jeroen van Baarsen 0faf80aa9d Temp fix for rspec so the specs are run again 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-06-06 08:25:02 +02:00
Dmitriy Zaporozhets 67ba36ebac Revert "Revert "Fix for failing specs"" 
This reverts commit 2545b0f858.
 2014-06-06 09:01:17 +03:00
Jeroen van Baarsen 2545b0f858 Revert "Fix for failing specs" 
This reverts commit 2314438925.

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>

Conflicts:
	Gemfile.lock
 2014-06-05 20:21:28 +02:00
Dmitriy Zaporozhets c283fba3b7 Improve performance of application for large teams 
This commit fixes a lot of sql queries to db for for groups and projects
with big amount of members.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 11:52:17 +03:00
Marin Jankovski 209726917b Fix the system_hook test. 2014-06-03 11:37:23 +02:00
Marin Jankovski 1dca950c28 Fix failing submodule test. 2014-06-03 11:37:23 +02:00
Dmitriy Zaporozhets a54bef0a42 Merge pull request #6943 from jvanbaarsen/spec-fix 
Fix for failing specs
 2014-06-03 09:13:33 +03:00
Dmitriy Zaporozhets f9dd140280 Merge branch 'add_noreferrer_to_all_links' into 'master' 
Add nofollow to all external links

Fixes #1224
 2014-06-02 11:52:03 +00:00
Jeroen van Baarsen 2314438925 Fix for failing specs 2014-05-30 23:19:50 +02:00
Marin Jankovski 4a03bbe483 Add nofollow to all internal links. 2014-05-30 17:09:31 +02:00
Dmitriy Zaporozhets f329d34ff3 Fix group projects fetch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 22:03:42 +03:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag 
Add CreateTagService.  Use new service to allow tag creation through API.
 2014-05-29 15:37:42 +03:00
Marin Jankovski c1551c6ed0 Fix routing tests. 2014-05-29 08:58:15 +02:00
Dmitriy Zaporozhets cea0fc1de8 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:33:49 +03:00
Dmitriy Zaporozhets 14f78d067d Modify specs for new project transfer code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:04:18 +03:00
Sean Edge 28de31f520 Fix broken repositories_spec test for creating new tags. 2014-05-28 11:14:51 -04:00
Dmitriy Zaporozhets 8a3807c838 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 12:40:22 +03:00
Sean Edge a8f2977c6a More fixup for HoundCI. Fix up some small issues in docs. 2014-05-27 08:22:04 -04:00
Dmitriy Zaporozhets 3bdf0e2921 Merge branch 'compare-api' into 'master' 
Compare api

Fixes #1165
 2014-05-27 11:16:07 +00:00
Dmitriy Zaporozhets c7e00aca2d Better specs for Compare API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:27:42 +03:00
Dmitriy Zaporozhets 10ee137e9c Expose timeout and same_ref compare fields 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 11:16:50 +03:00
Sean Edge 435740b8a2 Fixup for HoundCI. 2014-05-26 12:32:01 -04:00
Sean Edge 446e920a1b Add tests for creating tag with API. 2014-05-26 12:30:58 -04:00
Dmitriy Zaporozhets 242291850d Add some tests to compare api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-26 18:05:55 +03:00