home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,058 Commits 48 Branches 340 Tags
d89c6adfe675620cb1730fa3036ddff18ff20105
Commit Graph
7058 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets d89c6adfe6 Improve select UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 22:32:28 +02:00
Dmitriy Zaporozhets bd2ca33d58 Merge branch 'relative' of /home/git/repositories/gitlab/gitlabhq 2013-11-12 18:14:44 +00:00
Dmitriy Zaporozhets 99334d4b57 Merge branch 'feature/broadcast_messages' of /home/git/repositories/gitlab/gitlabhq 2013-11-12 18:13:26 +00:00
Dmitriy Zaporozhets 3397361fd7 Spinach test for broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 18:56:48 +02:00
Marin Jankovski 4e9284a023 Clear state in test satellite dir. 2013-11-12 15:11:46 +01:00
Dmitriy Zaporozhets 13a6604030 Ability to remvoe broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 15:20:31 +02:00
Dmitriy Zaporozhets c5b667351a Show broadcast message to users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 15:08:20 +02:00
Dmitriy Zaporozhets 963a31144b Active tab tests for admin broadcast messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 14:32:17 +02:00
Dmitriy Zaporozhets 90d599397f Add broadcast messages to admin nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 14:29:43 +02:00
Dmitriy Zaporozhets dd501aa7a7 Broadcast messages scaffold in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 14:28:12 +02:00
Dmitriy Zaporozhets f1ecf53c1e Broadcast message model + migrations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 13:47:28 +02:00
Dmitriy Zaporozhets 0a08c77519 Improve UX for project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 12:56:20 +02:00
Dmitriy Zaporozhets 00d6ac299e Fix no-ssh-key-message path for cookie 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 10:36:09 +02:00
Marin Jankovski e16eb91299 Merge branch 'master' into relative 2013-11-12 09:26:17 +01:00
Dmitriy Zaporozhets 80b113705d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-11-12 10:19:58 +02:00
Dmitriy Zaporozhets b983e9ef0a Add ability to hide no ssh key message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-12 10:19:23 +02:00
Dmitriy Zaporozhets 629cb8741b Merge branch 'do-image' of /home/git/repositories/gitlab/gitlabhq 2013-11-12 07:36:01 +00:00
Sytse Sijbrandij 84af998aea Turnkey Linux has not been updating consistently. 2013-11-11 16:03:45 -05:00
Dmitriy Zaporozhets a516a8469b Merge branch 'feature/edit_file_api' of /home/git/repositories/gitlab/gitlabhq 2013-11-11 13:51:48 +00:00
Dmitriy Zaporozhets 986697a99b Refactor Create/Update file context and lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-11 14:58:39 +02:00
Dmitriy Zaporozhets c77d957b36 API: Edit file in repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-11 14:58:06 +02:00
Dmitriy Zaporozhets 75303241b1 Merge pull request #5575 from chopmann/patch-1 
FIX: note-original-content appending itself too many times
 2013-11-11 02:48:42 -08:00
Cornelio Hopmann 92b7c569a7 FIX: note-original-content appending itself too many times 2013-11-10 13:01:29 +00:00
Dmitriy Zaporozhets 79afb001ad Fix type in API doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-10 10:43:04 +02:00
Dmitriy Zaporozhets c9e31875dc Merge pull request #5566 from dpursehouse/improve-email-notification-message 
Improve message in email notifications
 2013-11-10 00:41:25 -08:00
Dmitriy Zaporozhets fa323c0ca1 Merge pull request #5570 from iBotPeaches/master 
Allow closes/closed & fixes/fixed for automatic issue closing
 2013-11-09 01:44:36 -08:00
Dmitriy Zaporozhets ca196453f0 Merge branch 'feature/api_create_file' of /home/git/repositories/gitlab/gitlabhq 2013-11-09 09:42:29 +00:00
Dmitriy Zaporozhets f64dd1b492 Add docs for create file API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-09 11:40:17 +02:00
Dmitriy Zaporozhets ea3680ad80 Merge pull request #5571 from bke-drewb/email 
Fix minor errors/annoyances in email templates
 2013-11-08 23:59:27 -08:00
Dmitriy Zaporozhets b287462bb4 Merge pull request #4795 from bke-drewb/issue-4769 
Issue-4769 - Unable to update case of label
 2013-11-08 23:59:04 -08:00
Dmitriy Zaporozhets 9d79d6e152 Make sure private_token for API is a string 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-08 18:49:38 +02:00
Dmitriy Zaporozhets dfade97edf Merge branch 'contribution-license-agreement' of /home/git/repositories/gitlab/gitlabhq 2013-11-08 16:33:52 +00:00
Dmitriy Zaporozhets 4b98597edc Add specs for Email confirmation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-08 18:29:26 +02:00
Drew Blessing 57ad81a9c5 Fix minor errors/annoyances in email templates 
There was some funny syntax in merge request email templates. There was a ! before
the merge request number when there probably should be a #. This may be some carry over
from markdown but should not be in email templates.  There were also some capitalization
discrepancies among the subject lines. For those OCD people out there I standardized the
capitalization. :)
 2013-11-08 10:20:15 -06:00
Marin Jankovski e130e2f6c7 Check on fs. 2013-11-08 17:20:13 +01:00
Dmitriy Zaporozhets ce1efb56eb Merge branch 'ra_default' of /home/git/repositories/gitlab/gitlabhq 2013-11-08 16:19:40 +00:00
Dmitriy Zaporozhets f97cb7f11c Merge branch 'no_separate_gem' of /home/git/repositories/gitlab/gitlabhq 2013-11-08 16:18:55 +00:00
Marin Jankovski 979ca7d6a2 Correct check. 2013-11-08 16:34:15 +01:00
Connor Tumbleson a360ce73b2 Allow closes/closed & fixes/fixed for automatic regex closing 2013-11-08 07:51:29 -06:00
Dmitriy Zaporozhets 02484930e1 Removed Project#discover_default_branch since it not needed any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-08 09:22:50 +02:00
David Pursehouse 54e65c1176 Improve message in email notifications 2013-11-08 15:48:45 +09:00
Dmitriy Zaporozhets e8bb32e623 Specs for Create file API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-07 18:53:35 +02:00
Dmitriy Zaporozhets 0b67606af6 New API: create file in repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-07 18:53:09 +02:00
Marin Jankovski da238bbdf4 Remove separate installation of charlock_holmes. 2013-11-07 09:56:12 +01:00
Dmitriy Zaporozhets c28786ecbe Require gitlab-shell 1.7.6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 21:52:37 +02:00
Dmitriy Zaporozhets 253680bbff Merge branch 'improve/default_branch' of /home/git/repositories/gitlab/gitlabhq 2013-11-06 18:24:19 +00:00
Dmitriy Zaporozhets 7ab3bf9668 update CHANGELOG with default_branch changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:43:51 +02:00
Dmitriy Zaporozhets 0ba378dcb3 Fix spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:38:37 +02:00
Dmitriy Zaporozhets cfa15d0846 Remove default_branch support from API project creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:14:11 +02:00
Dmitriy Zaporozhets 580dfe5af9 Replace assign with stub for default_branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:13:45 +02:00