home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +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
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 9651457260 Merge branch 'mr_votes_api' of /home/git/repositories/gitlab/gitlabhq 2013-10-08 08:11:33 +00: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
Islam AmerandJacob Vosmaer 29c807ced3 Expose votes in merge request api 
Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
 2013-10-08 09:32:00 +02:00
Dmitriy Zaporozhets 07437ac3d4 Merge branch 'feature/ssh_ldap_check' of /home/git/repositories/gitlab/gitlabhq 2013-10-08 06:03:20 +00:00
Dmitriy Zaporozhets db10e6aaa6 Fix merge request model spec 2013-10-07 19:42:59 +03:00
Dmitriy Zaporozhets eb7072de91 Fix avatar margin for files view 2013-10-07 16:56:02 +03:00
Dmitriy Zaporozhets baa65e89b9 Check if LDAP user was removed or blocked when use git over ssh 2013-10-07 16:06:30 +03:00
Dmitriy Zaporozhets 2db9410945 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-07 15:45:31 +03:00
Dmitriy Zaporozhets bef632e816 Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq 2013-10-07 12:45:20 +00:00
Jacob Vosmaer 78b3fb769c Run stopping commands in the foreground 2013-10-07 14:40:56 +02:00
Jacob Vosmaer 83e9825c97 Fix sudo commands in update guides 2013-10-07 14:16:04 +02: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 dc825ae330 Merge branch 'feature/api_remove_group' of /home/git/repositories/gitlab/gitlabhq 2013-10-07 11:32:25 +00: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 3db47d12f2 Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhq 2013-10-07 10:29:00 +00:00
Dmitriy Zaporozhets 93341579b6 Mention remove group api in CHANGELOG 2013-10-07 13:27:32 +03:00
Dmitriy Zaporozhets 1a18e778f5 Remove group api specs 2013-10-07 13:18:37 +03:00
Dmitriy Zaporozhets f141711cfd API: new feature - remove group 2013-10-07 13:10:01 +03:00
Jacob Vosmaer 99916fe159 Add troubleshooting hints to update hook check 2013-10-07 11:27:38 +02:00
Dmitriy Zaporozhets 073c8a2966 Merge pull request #5230 from cmckni3/patch-1 
Fix invalid json in API docs
 2013-10-06 22:44:03 -07:00
Nate Beck c6d6c0d114 Update installation.md 
Add the -y option to the python apt-get install commands to be consistent with the rest of the Document.
 2013-10-06 02:55:01 -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
Dmitriy Zaporozhets dc00562fa2 Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq 2013-10-04 13:26:49 +00:00
Marin Jankovski a817993439 Remove outdated comments. 2013-10-04 13:26:48 +02:00
Dmitriy Zaporozhets d3450ad2be Merge branch 'improve_sidekiq_check' of /home/git/repositories/gitlab/gitlabhq 2013-10-04 11:24:27 +00:00
Dmitriy Zaporozhets 0223597aca Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-10-04 14:22:43 +03:00
Dmitriy Zaporozhets 499158a4d2 Merge branch 'requirements-cloud-experience' of /home/git/repositories/gitlab/gitlabhq 2013-10-04 11:17:12 +00:00
Marin Jankovski fa7d75733c Fix failed merge when filename is the same as target branchname. 2013-10-04 12:38:49 +02:00
Sytse Sijbrandij 363c5204d9 Better requirements based on the experience of GitLab Cloud. 2013-10-04 12:20:40 +02:00
Jacob Vosmaer 4017789f5a Only kill sidekiqs belonging to gitlab user 2013-10-04 11:25:44 +02: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
Jacob Vosmaer e8b9712d89 Merge pull request #5262 from yatish27/master 
Typo:Corrected the typo of sign-in in User Model
 2013-10-03 06:21:05 -07:00
Jacob Vosmaer 37868d7bd6 Merge pull request #5160 from nummy/patch-1 
Improve 6.0-to-6.1.md update guide
 2013-10-03 06:17:27 -07: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
Dmitriy Zaporozhets 1a6ba7e640 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-10-03 09:33:39 +03:00
Dmitriy Zaporozhets 62673d58ed Merge branch 'update_api_documentation' of /home/git/repositories/gitlab/gitlabhq 2013-10-03 06:27:47 +00:00
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
Marin Jankovski da54a1e644 Update group access levels in docs. 2013-10-02 16:41:01 +02:00
Dmitriy Zaporozhets c44c5f5faa Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq 2013-10-02 14:14:49 +00:00
Dmitriy Zaporozhets b0439a7802 Merge branch 'pg_installation' of /home/git/repositories/gitlab/gitlabhq 2013-10-02 14:14:09 +00:00
Dmitriy Zaporozhets 0cdb15b004 Merge branch 'new-site' of /home/git/repositories/gitlab/gitlabhq 2013-10-02 14:11:08 +00:00
Dmitriy Zaporozhets 3a1ab65e49 Merge branch 'add-backup-to-readme' of /home/git/repositories/gitlab/gitlabhq 2013-10-02 14:10:44 +00:00
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
Sytse Sijbrandij a859723ef8 Add direct link to backup task and some other interfaces. 2013-10-02 15:02:54 +02:00