home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +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
Stuart Pook 9886998f24 Add method to get the comments on a merge request 
Add method to get the comments for a merge request and
document that you can change the status of a merge request.
 2014-03-19 19:07:51 +01:00
Evgeniy Sokovikov 4f68e15d9e typo fix 2014-03-19 20:08:26 +03:00
dosire 2e33a82072 Spinner in changelog. 2014-03-19 17:10:22 +01:00
Sytse Sijbrandij ad3acff409 Merge pull request #6469 from mojavelinux/master 
Add .adoc file extension for AsciiDoc
 2014-03-19 16:07:38 +01:00
Sytse Sijbrandij 6b522bf950 Merge pull request #6457 from lol768/patch-1 
Fix registration error info typo
 2014-03-19 16:06:31 +01:00
Sytse Sijbrandij 16f18227a8 Merge pull request #6535 from docwhat/sys-hooks-eols 
Switched line endings to LF for system_hooks.md
 2014-03-19 15:23:37 +01:00
Job van der Voort 622bbf9629 line break 2014-03-19 14:07:42 +01:00
Job van der Voort 0e31cb40d3 require public email with oauth provider message 2014-03-19 14:01:13 +01:00
Dmitriy Zaporozhets 492dc82ced Merge pull request #6557 from tsigo/faster-merge-request-features 
Speed up features/notes_on_merge_requests_spec
 2014-03-19 14:45:15 +02:00
Dmitriy Zaporozhets 587e16a4e3 Merge pull request #6560 from tsigo/visibility-traits 
Visibility traits for Project Factory
 2014-03-19 14:44:08 +02:00
Dmitriy Zaporozhets 1921a934a9 Add room placeholder for Slack integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 14:42:13 +02:00
dosire 7d36d71d97 Run the RC on Cloud. 2014-03-19 12:46:18 +01:00
Dmitriy Zaporozhets d2dc0385a2 Merge branch 'nprogress' into 'master' 
Nprogress
 2014-03-19 11:05:26 +00:00
Dmitriy Zaporozhets c1fd25ce6e Replace turbolink spinner with nprogress 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 12:59:23 +02:00
Robert Speicher 1897fb00b8 Make use of project factory traits 2014-03-19 05:15:24 -04:00
Robert Speicher 65d634706c Add public/private/internal traits to :project Factory 2014-03-19 05:14:27 -04:00
Robert Speicher a90574fab2 Speed up finders/merge_requests_finder_spec 
Uses the :simple merge request factory trait introduced by d166e70; cuts
execution time of this spec in half.
 2014-03-19 03:57:38 -04:00
Robert Speicher 53d3294d1d Speed up features/notes_on_merge_requests_spec 
This spec featured the slowest tests in the entire suite. After some
debugging, the cause was found to be the large commit diff generated by
comparing the stable and master branches.

To fix this, the seed repository was modified to create a simple branch
off of master that consists of three simple commits and minor changes.
The spec was then updated to compare master to this branch instead of
stable. The result is a spec group that runs in under 30 seconds, down
from about 90.
 2014-03-19 03:57:37 -04:00
Dmitriy Zaporozhets 046773d6e5 Merge pull request #6558 from tsigo/master 
Fix travis setup
 2014-03-19 09:42:02 +02:00
Dmitriy Zaporozhets d7b5656dab Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-19 09:37:14 +02:00
Dmitriy Zaporozhets 11a56ccd21 Merge pull request #6550 from razielgn/slack-integration 
Added Slack service integration.
 2014-03-19 09:36:51 +02:00
Robert Speicher b6778cb2ea Fix travis setup 2014-03-18 22:21:25 -04:00
Franz-Robert f03820ebf2 Update 6.0-to-6.5.md 
A lot of users get authentication errors after this upgrade. Reason being the change in 6.5 that secure cookies when using https. A link to this would be very handy for other upgraders!

https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide#cant-verify-csrf-token-authenticitycant-get-past-login-pageredirected-to-login-page
 2014-03-18 23:17:27 +01:00
Federico Ravasio e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +01:00
Dmitriy Zaporozhets e4a7dae329 Merge branch 'ldap_password' into 'master' 
Prevent LDAP users from using reset password function
 2014-03-18 16:22:24 +00:00
dosire d09f5796bf Split up the lines for Jacob. 2014-03-18 16:25:54 +01:00
dosire 257aa851d2 Deploy key needed documentation. 2014-03-18 16:24:49 +01:00
Marin Jankovski a740e2d6d1 Do not allow password reset for ldap user. 2014-03-18 12:25:49 +01:00
Jacob Vosmaer acaf297846 Merge pull request #5993 from DarkHorseComics/bypass-commented-sqlite 
Explain what to do about legacy sqlite in database.yml
 2014-03-18 10:48:27 +01:00
Dmitriy Zaporozhets 8fa53ce43d Merge branch 'check_orphaned_users_groups' into 'master' 
Check Orphaned Users Groups
 2014-03-18 07:14:08 +00:00
Jamey J. DeOrio 37192d5e18 Add more descriptive line for resolving sqlite error during check 2014-03-17 09:43:27 -07:00
Marin Jankovski 11f20576e9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-17 16:34:34 +01:00
Marin Jankovski 1c6e93edf9 Add change to changelog. 2014-03-17 16:33:29 +01:00
Sytse Sijbrandij b36441f4d6 Merge pull request #6529 from MrKeiKun/system-hook-fix 
Fixed some minor typos
 2014-03-17 16:11:06 +01:00
Dmitriy Zaporozhets 493c7a6147 Merge branch 'links_within_same_repo' into 'master' 
Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
 2014-03-17 14:06:08 +00:00
Dmitriy Zaporozhets 66c4a7dba1 Merge branch 'mysql-to-og' into 'master' 
MySQL to Postgres script
 2014-03-17 13:57:52 +00:00
dosire 70994c348d Postgresql conversion script. 2014-03-17 14:55:56 +01:00
Dmitriy Zaporozhets de855e2420 Default value for Snippet#private 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:50:16 +02:00
Dmitriy Zaporozhets cb43d88ada Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-17 15:47:58 +02:00
Dmitriy Zaporozhets d5796975e7 Merge pull request #6544 from cirosantilli/show-link-to-public-projects-for-new-users 
Show link to public projects for new users.
 2014-03-17 15:43:30 +02:00
Jacob Vosmaer 5e7e814e81 Drop UsersGroup orphans using rails runner 2014-03-17 14:42:20 +01:00
Sytse Sijbrandij 90d7ac3b9e Merge branch 'deeplink' into 'master' 
Deeplink

/cc @dzaporozhets
 2014-03-17 13:37:33 +00:00
dosire 67eb14d308 We have html targets for paragraphs now. 2014-03-17 14:36:20 +01:00
Dmitriy Zaporozhets 0f204c3222 Merge branch 'project-permissions' into 'master' 
API: Project permissions
 2014-03-17 13:30:28 +00:00
Dmitriy Zaporozhets 63a8af677a Merge branch 'split-api-files' into 'master' 
Move project members api to separate file
 2014-03-17 13:30:10 +00:00
Dmitriy Zaporozhets c02e3d441b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:29:45 +02:00
Dmitriy Zaporozhets 86c76eccea Add more api docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:22:39 +02:00
Dmitriy Zaporozhets 928b7f3bff Add tests for API project permissions info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:14:27 +02:00
Dmitriy Zaporozhets 0ea0e542a9 Remove old entities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:35:50 +02:00
Dmitriy Zaporozhets eea317795e Add current user permissions info to /api/projects/:id.json 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:33:41 +02:00