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
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 10fac47527 Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 09:32:38 +00:00
Dmitriy Zaporozhets 9fa94cad56 Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 09:32:12 +00:00
Sytse Sijbrandij 6cc3bb0f8f Explain how group and project permissions interact. 2013-10-11 10:40:22 +02:00
Marin Jankovski c07251887c Merge branch 'master' into relative_links_in_documentation 2013-10-11 10:00:50 +02:00
Izaak Alpert 0cd28156d5 Updated missed styles 
Change-Id: I05e02ff7e36e2350cdf5d2b94095ada9760a204e
 2013-10-10 09:17:30 -04:00
Izaak Alpert 3e71af9f7f Fix style issues 
Change-Id: I1ffe18414b7f6eae38d7860a8e3b64a9a185273f
 2013-10-10 09:17:30 -04:00
Izaak Alpert 9d5bb5a792 Brings this fix inline with updates to master 
Change-Id: Ia50c3ac043b4c927ca59cbbdc2bba42f73e550e4
 2013-10-10 09:17:30 -04:00
Izaak Alpert af1a33917a Create a wiki when wiki_enabled:true 
Change-Id: I7aaab4b1f54fd2719a8a63d9069ddd5c59868e34
 2013-10-10 09:17:30 -04:00
Marin Jankovski 4654999288 Merge branch 'master' into relative_links_in_documentation 2013-10-10 15:09:12 +02:00
Marin Jankovski 5b23a7bbb9 Cover a special case. 2013-10-10 14:29:16 +02:00
Marin Jankovski 5277ac1b15 Added comments and split the methods further. 2013-10-10 11:16:15 +02:00
Dmitriy Zaporozhets e8d1e827d8 Remove unnecessary tag 2013-10-10 12:14:21 +03:00
Sytse Sijbrandij b0502c20a9 Consistent naming to make difference between clicking on profile pic and profile settings clear. 2013-10-10 10:43:24 +02:00
Dmitriy Zaporozhets d1ffbdfcb6 Avoid 500 error on project page when application is close to RAM limit 2013-10-10 11:05:49 +03:00
Dmitriy Zaporozhets bd83991ac7 Use link_to_project helper 2013-10-10 10:53:49 +03:00
Dmitriy Zaporozhets 573c89e624 Improve Profile#account page UI 2013-10-10 10:30:07 +03:00
Dmitriy Zaporozhets 1935b494f6 Merge branch 'refactor/profile_account' of /home/git/repositories/gitlab/gitlabhq 2013-10-10 04:58:17 +00:00
Jacob Vosmaer 461abaa843 Add GollumWiki#empty? method 2013-10-09 17:17:52 +02:00
Dmitriy Zaporozhets e50c0d5cb7 Fix spinach profile tests 2013-10-09 17:01:04 +03:00
Dmitriy Zaporozhets 92768844cf Reverted accidently removed registration module 2013-10-09 13:52:03 +00:00
Dmitriy Zaporozhets ffec158de4 Restyle Profile#Account page 2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets 4c8224ae1e Move profile account to separate controller 2013-10-09 16:43:17 +03:00
Dmitriy Zaporozhets c41e66db52 Separate page for password change 2013-10-09 16:43:11 +03:00
Marin Jankovski 7dbbb6defe Rename method to avoid clashes. 2013-10-09 15:01:02 +02:00
Dmitriy Zaporozhets f7ef23e412 Send devise emails async 2013-10-09 15:25:31 +03:00
Marin Jankovski 70f828cd4b Split. 2013-10-09 13:28:25 +02:00
Dmitriy Zaporozhets a37b8ab2b2 Merge pull request #5291 from astratto/title_issue_trackers 
Use proper titles for issues trackers
 2013-10-09 04:10:09 -07:00
Dmitriy Zaporozhets 87ffd67617 Improve Profile settings UI 2013-10-09 12:30:49 +03:00
Marin Jankovski 1eabd9dfec Merge branch 'master' into relative_links_in_documentation 2013-10-09 11:07:45 +02:00
Stefano Tortarolo 65f5d062e9 Use proper titles for issues trackers 2013-10-09 09:21:53 +02:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02:00
Abe Hassan 903090d148 Fix the sigil for merge request emails 2013-10-08 11:32:26 -07:00
Marin Jankovski 3682a0820b Match the brackets so we don't replace the regular text. 2013-10-08 15:44:52 +02:00
Andrew Kumanyaev 9ee49c5c49 Update merge requests from fork project to origin project 
Fix error described in https://github.com/gitlabhq/gitlabhq/issues/5185
 2013-10-08 16:45:57 +04:00
Marin Jankovski 06d6f44367 Check for wiki. 2013-10-08 14:21:01 +02:00
Marin Jankovski 817399e3be Show links with correct ref. 2013-10-08 13:07:59 +02:00
Marin Jankovski 810d90dd26 Search and replace relative links in tree/readme 2013-10-08 12:24:50 +02:00
Dmitriy Zaporozhets c147b571f4 Merge branch 'feature/system_hook_user_id' of /home/git/repositories/gitlab/gitlabhq 2013-10-08 09:28:27 +00:00
Dmitriy Zaporozhets 5cf31b92c4 Fix system hook page description 2013-10-08 12:06:46 +03:00
Dmitriy Zaporozhets 9a0329016b Mention SystemHook user_id in sample. Extend tests 2013-10-08 11:06:38 +03:00
Dmitriy Zaporozhets 3d51147de1 Add user_id to system hook when new user created 2013-10-08 10:54:40 +03:00
Dmitriy Zaporozhets eb7072de91 Fix avatar margin for files view 2013-10-07 16:56:02 +03:00
Dmitriy Zaporozhets b658489f27 Fix bugs when discussion visible in wrong project 
Because notes scope was not limited by project in
MergeRequest#mr_and_commit_notes it causes comments from project A
appears in discussions for MR in project B.
 2013-10-07 14:49:01 +03:00
Dmitriy Zaporozhets 2eb76186f5 Merge pull request #5158 from tkoenig/fix-active-milestone-order 
Sort active milestones by due date (upcoming first)
 2013-10-07 03:35:09 -07:00
Dmitriy Zaporozhets 83c727c550 Merge pull request #5216 from bladealslayer/feature/flowdock_integration 
Added Flowdock integration support via a service.
 2013-10-04 08:00:51 -07:00
Boyan Tabakov e8b6974af3 Use gitlab-flowdock-git-hook patched for dependency on gitlab-grit, instead of grit. 
Make sure the flowdock-git-hook is loaded. Seems it is not autoloader, due to the gem/lib name mismatch.
 2013-10-03 16:36:43 +03:00
Yatish Mehta 9d622bd790 Typo:Corrected the typo of sign-in in User Model 2013-10-03 14:34:51 +05:30
devaroop b9d58c4cec getting user keys publically through http without any authentication, the github way. E.g: http://github.com/devaroop.keys 
changelog updated to include ssh key retrieval feature update
 2013-10-03 12:50:33 +05:30
devaroop b6bd4856a3 getting user keys publically through http without any authentication, the github way. E.g: http://github.com/devaroop.keys 2013-10-02 20:39:29 +05:30
Drew Blessing 45de7d263d Issue-4769 - Unable to update case of label 
Labels are saved in the database with the case they were originally created with.
Before this change if a user created a label with the same text but different case
the label would use the original case and no new label would be created in the
database. With this change, labels are now case-sensitive.

Steps to test:

1. Before this change, create a new issue with a new label "FIxMe"
2. Edit the issue and change the label to "FixMe"
3. Note that the label reverted to "FIxMe"
4. Apply this change
5. Edit the issue again and change the label to "FixMe"
Note that the new case was preserved. If you also look in the database in the "tags" table you will see that both labels are present - "FIxMe" and "FixMe".
 2013-10-02 08:18:28 -05:00