home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets f82c14259b Rebuild navigation for dashboard 
* projects from explore page are available from dashboard
* use dashboard sidebar for both logged in and not users
* move explroe projects under projects tab
* move explore groups under groups tab
* move public snippets under snippets tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 11:59:21 +02:00
Artem Sidorenko 55dca86b98 Import sources: settings in the admin interface 2015-08-20 11:28:27 +02:00
Dmitriy Zaporozhets b1c1a3d3cc Refactor sidebar navigation for dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 10:59:05 +02:00
Stan Hu 98eb89be5d Only show recent push event if the branch still exists or a recent merge request has not been created 
Closes #2277
 2015-08-20 01:38:15 -07:00
Stan Hu 0a5b005da1 Fix blame view line groupings 
Closes #2305
 2015-08-20 01:27:29 -07:00
Stan Hu 001c8cd0ee Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries 
Closes https://github.com/gitlabhq/gitlabhq/issues/9560
 2015-08-19 23:18:34 -07:00
Douwe Maan 83081f1673 Start on tests. 2015-08-19 18:00:13 -07:00
Douwe Maan 19a049ece9 Make documentation clearer. 2015-08-19 17:43:36 -07:00
Douwe Maan 9501495aeb Fix init.d script. 2015-08-19 17:43:24 -07:00
Sytse Sijbrandij 55fc58bda4 Merge branch '2fa-message-improvement' into 'master' 
Improved 2FA warning message about lost codes

Fixes internal issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2472

The warning message now clearly states that access will be lost of the 2FA recovery codes are not saved.

/cc @sytses @JobV

See merge request !1175
 2015-08-19 23:21:02 +00:00
Patricio Cano 475bb00bde Improved 2FA warning message about lost codes 2015-08-19 18:13:01 -05:00
Douwe Maan 41fdd20c74 Test Gitlab::ReplyByEmail. 2015-08-19 16:05:58 -07:00
Douwe Maan eacdd5080a Fix Basemailer#can? 2015-08-19 14:58:41 -07:00
Douwe Maan 1202875dff Fix lib/support/init.d/gitlab. 2015-08-19 14:54:30 -07:00
Douwe Maan c50e5e68c7 Fix bin/mail_room. 2015-08-19 14:27:47 -07:00
Douwe Maan 34026c97b4 Add documentation. 2015-08-19 13:58:14 -07:00
Douwe Maan f3b57ce677 Update init scripts. 2015-08-19 13:58:07 -07:00
Douwe Maan 089aa2de2b Add Reply by email feature to admin dashboard. 2015-08-19 13:57:27 -07:00
Douwe Maan 0bc94198fc Fix BaseMailer. 2015-08-19 12:51:42 -07:00
Douwe Maan 4e33127b3a We'll get the <p> for free. 2015-08-19 12:38:08 -07:00
Douwe Maan ed6122d7ea Markdown, not GFM. 2015-08-19 12:37:34 -07:00
Douwe Maan 992dbbd9fe Move sent_notification! out of Notify. 2015-08-19 12:35:23 -07:00
Douwe Maan a8a861ae2a Add BaseMailer to house shared mailer functionality. 2015-08-19 12:35:08 -07:00
Douwe Maan 03b54f1f03 Fix responding to commit notes 2015-08-19 11:35:13 -07:00
Douwe Maan 76dbafba86 Send a rejection email when the incoming email couldn't be processed. 2015-08-19 11:10:21 -07:00
Douwe Maan 170aa3b43b Update mail_room. 2015-08-19 10:18:20 -07:00
Douwe Maan ee1eb2948d Turn reply-by-email attachments into uploads. 2015-08-19 10:18:05 -07:00
Douwe Maan 01c5ecedd4 Add "Reply to this email directly" to notification footer. 2015-08-19 10:17:51 -07:00
Douwe Maan 6b31827a41 Include display name with reply to address. 2015-08-19 10:17:32 -07:00
Douwe Maan 4f34d363a5 Correctly set Message-ID for comment notifications. 2015-08-19 10:17:20 -07:00
Douwe Maan 73eef57d5e Make MR notification email subject more standard. 2015-08-19 10:16:30 -07:00
Douwe Maan 4df4097e32 Merge pull request #9551 from Telekom-PD/feature/search-for-archived-projects 
Feature/search for archived projects
 2015-08-19 08:53:08 -07:00
Dmitriy Zaporozhets b7e6ae03dc Case-insensetive search for comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 15:59:48 +02:00
Artem Sidorenko 0719022739 Spinach tests 2015-08-19 13:47:03 +02:00
Artem Sidorenko 15cdf551fc Show colored icons like in the admin listing 2015-08-19 13:47:03 +02:00
Artem Sidorenko 10d2281d73 Show label on archived projects 2015-08-19 13:47:03 +02:00
Artem Sidorenko 3ebbed25f0 Allow listing of archived projects 
Resolves #9285
 2015-08-19 13:46:59 +02:00
Job van der Voort 3659d3b5c6 Merge branch 'security' into 'master' 
Added note about backing up recovery codes

Several people have tried to recover their 2FA codes. I think we could be more clear about it in the docs.

This is why I added a section about it at the top, so they read it before enabling them.

https://twitter.com/deathgreps/status/632006221814464512
https://twitter.com/benniemosher/status/633768429313372160

See merge request !1923
 2015-08-19 10:27:03 +00:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
Dmitriy Zaporozhets a3e1d7cf93 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-19 09:47:33 +02:00
Stan Hu e56fd693ee Merge pull request #9567 from bigsurge/bigsurge-patch-1 
add CommitNote field expose :created_at
 2015-08-19 00:23:17 -07:00
Robert Schilling 51e64356d7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-19 09:01:46 +02:00
Robert Schilling 7f19d55c7c Time for 8.0.0.pre 2015-08-19 09:01:22 +02:00
bigsurge cecc18616a add CommitNote field expose :created_at 
add CommitNote field expose :created_at
 2015-08-19 14:29:18 +08:00
Douwe Maan 8906cabae7 Changes and stuff. 2015-08-18 17:02:26 -07:00
Sytse Sijbrandij a1bd164e72 Merge branch 'wip-blog-post' into 'master' 
Make sure blog post MR has WIP keyword

cc @sytses @rspeicher

See merge request !1172
 2015-08-18 23:38:42 +00:00
karen Carias b04914ab46 added note about backing up recovery codes 2015-08-18 15:56:38 -07:00
Douwe Maan a428838dc0 Update mail_room 2015-08-18 15:50:46 -07:00
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -07:00
Douwe Maan 91fa82d11f Merge branch 'rs-help-path-traversal' into 'master' 
Fix path traversal in HelpController

Closes #2543

See merge request !1922
 2015-08-18 16:45:10 +00:00