home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +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 4db2e97bf4 6.4 in beta now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 17:10:12 +02:00
Dmitriy Zaporozhets bd94cae8f4 Merge branch 'irc-official' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 15:03:18 +00:00
Jason Hollingsworth e1fa9abd89 Change archive icon and clone panel styling. 2013-12-18 08:46:06 -06:00
Dmitriy Zaporozhets 5e21976d13 Set font-weight:500 for row titles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:33:40 +02:00
Dmitriy Zaporozhets 078b3f580e Rename Services to Project services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:27:52 +02:00
Dmitriy Zaporozhets 3b0acc9eea Merge branch 'bug/archive_label_overflow' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 14:22:59 +00:00
Dmitriy Zaporozhets 4efaa51bbe Make comment preview button white 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:07:49 +02:00
Dmitriy Zaporozhets 1f41e1bcdd Improve commits page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 16:03:59 +02:00
Dmitriy Zaporozhets 5cb8525891 move arhoved label from project title to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 15:02:31 +02:00
Dmitriy Zaporozhets 79248f4ca5 Merge pull request #5866 from jhollingsworth/fix/default-public-pull-url 
Update default public pull url.
 2013-12-18 04:41:06 -08:00
Dmitriy Zaporozhets dad576a777 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-18 14:40:37 +02:00
Dmitriy Zaporozhets afd747d4d7 Merge branch 'feature/email_on_push_service' of /home/git/repositories/gitlab/gitlabhq 2013-12-18 12:40:09 +00:00
Dmitriy Zaporozhets bb0a47d410 Merge pull request #5868 from beautyfree/patch-1 
Duplicate opened scope for issue
 2013-12-18 04:23:13 -08:00
Dmitriy Zaporozhets bea6eba8b5 Merge pull request #5869 from Spone/patch-1 
Tiny wording fix
 2013-12-18 04:22:46 -08:00
Dmitriy Zaporozhets 6ac73f45f0 Move EmailOnPush logic to async worker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 13:42:12 +02:00
Dmitriy Zaporozhets fc3878c034 Email on push mailer spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 13:30:04 +02:00
Hans Lemuet ff0d8a18bf tiny wording fix 
GitLab users can can see this snippet -> GitLab users can see this snippet
 2013-12-18 00:04:40 +01:00
Alexey Elizarov 984eb08cbe Duplicate opened scope for issue 
Was it correct?
 2013-12-17 23:32:19 +03:00
Jason Hollingsworth 1521f467cb Update default public pull url. 
This updates the default pull URL for public projects when the user
is not logged in.
 2013-12-17 12:48:59 -06:00
skv 3adf35fb64 pluck user_ids during team import 2013-12-17 22:37:56 +04:00
dosire b563fccbbc Remove line break. 2013-12-17 18:00:43 +01:00
dosire fb44054e98 Make irc channel official. 2013-12-17 17:59:09 +01:00
Jason Blanchard 65448e2ff7 Added dropdown menus to issue#show page for assignee and milestone 2013-12-17 09:39:50 -05:00
Dmitriy Zaporozhets 26c8b31634 Merge branch 'contributing-enhancements' of /home/git/repositories/gitlab/gitlabhq 2013-12-17 14:35:37 +00:00
Dmitriy Zaporozhets 5f85d6d1ce Better description to EmailsOnPush service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:31:12 +02:00
Dmitriy Zaporozhets 68f8ffb551 Add spinach tests for email on push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:29:08 +02:00
Dmitriy Zaporozhets 074efd8fd5 Email on push: dont send email if new branch was pushed or branch was removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:20:45 +02:00
Dmitriy Zaporozhets 8b89ef8639 Add templates for Emails on push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 15:30:15 +02:00
Dmitriy Zaporozhets 0b59af49cb Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 14:50:19 +02:00
Dmitriy Zaporozhets d550933907 Add new method to mailer for deliver emails with push info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 14:45:55 +02:00
Dmitriy Zaporozhets 2428a0b2dd Add project_services dir to autoload path 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:58:44 +02:00
Dmitriy Zaporozhets 86a8796b13 Create EmailsOnPushService model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:42:40 +02:00
Dmitriy Zaporozhets 5ac5730547 Sort project services by title. Add textarea support to it 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:42:13 +02:00
Dmitriy Zaporozhets b90cbfd21e Move project services models to own subdirectory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 12:20:36 +02:00
Dmitriy Zaporozhets 9c668133dc Add 6.4 entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 11:54:07 +02:00
Dmitriy Zaporozhets 26a5695e33 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 11:38:30 +02:00
dosire 49ad8f3b57 More hints for pull requests. 2013-12-17 09:37:53 +01:00
Dmitriy Zaporozhets 3d7edf0fe3 Merge pull request #5862 from jvanbaarsen/patch-1 
Fixed the no_avatar.png path
 2013-12-16 22:54:49 -08:00
Dmitriy Zaporozhets fe07c737aa Merge branch 'improve/devise_ui' of /home/git/repositories/gitlab/gitlabhq 2013-12-17 06:05:52 +00:00
Jeroen van Baarsen a9d1038f03 Fixed the no_avatar.png path 
Fixes: https://github.com/gitlabhq/gitlabhq/issues/4394
 2013-12-16 21:56:45 +01:00
Dmitriy Zaporozhets dea02363d4 Merge branch 'feature/project_in_mr_emails' of /home/git/repositories/gitlab/gitlabhq 2013-12-16 19:30:52 +00:00
Dmitriy Zaporozhets 80c4657fa7 Merge branch 'improve/repo_head_update' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
 2013-12-16 21:30:24 +02:00
Dmitriy Zaporozhets 42003f5312 Improve UI/UX for reset_password, signup, confirmation pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 21:11:52 +02:00
Dmitriy Zaporozhets 6f556d8e71 Add resend-confirmation-link to sign-in page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 21:10:59 +02:00
Dmitriy Zaporozhets 687cf48e60 Improve email with confirmation instructions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 21:10:18 +02:00
Dmitriy Zaporozhets 84f9613775 Style devise error messages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 21:09:15 +02:00
Dmitriy Zaporozhets f40ad6ce40 Merge pull request #5841 from Popl7/archiving_old_projects 
Archiving old projects for feature request
 2013-12-16 10:06:26 -08:00
Dmitriy Zaporozhets ca29617d54 Merge pull request #5843 from bke-drewb/fix/dashboard_event_updates 
Fix dashboard event caching
 2013-12-16 10:03:52 -08:00
Dmitriy Zaporozhets 0429740af6 Add @project variable to merge request emails 
After this change project name appears in the top part of email when you
open/close/accept merge request.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-16 19:56:47 +02:00
Thomas Guyot-Sionnest 843548cc76 Fix HTTP push to public repos 
When doing an HTTP push, git (as of v1.7.9) first do an info/refs
request, and only if this request requires authentication it asks the
user for its password and authenticates further requests.

The initial request normally clears without auth on public repos as it
doesn't update any ref. This patch forces every git-receive-pack
requests to provide authentication.
 2013-12-16 12:39:54 -05:00