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
7,337 Commits 48 Branches 340 Tags
29cb573b6ced5cfeca0fc905040ff615e2d76835
Commit Graph
7337 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rovanion Luckey 29cb573b6c Added example defaults file and appropriate documentation. 2013-12-09 14:05:50 +01:00
Dmitriy Zaporozhets dbf8ae7301 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-09 12:39:41 +02:00
Dmitriy Zaporozhets 74b720034a Merge branch 'users_group_observer' of /home/git/repositories/gitlab/gitlabhq 2013-12-09 10:38:46 +00:00
Jacob Vosmaer 31cdb7a405 Merge pull request #5471 from dex4er/feature_etc_default_gitlab 
Read configuration variable file (/etc/default/gitlab) if it is present
 2013-12-09 00:29:18 -08:00
Jacob Vosmaer 1af65c96c9 Avoid duplicate group membership emails 2013-12-09 09:22:59 +01:00
Sytse Sijbrandij abf11135c2 Merge pull request #5791 from mmoll/typo 
fix typo: enthousiast -> enthusiast
 2013-12-07 11:54:08 -08:00
Michael Moll 300ddbf45e fix typo: enthousiast -> enthusiast 2013-12-07 18:03:02 +01:00
Dmitriy Zaporozhets 845b98ec2b Merge branch 'add-book' of /home/git/repositories/gitlab/gitlabhq 2013-12-07 16:56:20 +00:00
dosire d514d7abf0 Mention enterprise edition and the book, also some cleanup. 2013-12-07 17:15:11 +01:00
Dmitriy Zaporozhets 1dfd585f3e Show rails version in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-06 22:20:11 +02:00
Dmitriy Zaporozhets 97e05469e2 Remove colors from icon helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-06 22:14:55 +02:00
Dmitriy Zaporozhets a4a27a5a2b Merge branch 'update-patch-guide' of /home/git/repositories/gitlab/gitlabhq 2013-12-06 20:03:50 +00:00
Dmitriy Zaporozhets 68d9538170 Merge branch 'feature/api_cors' of /home/git/repositories/gitlab/gitlabhq 2013-12-06 14:55:46 +00:00
dosire bdc745b291 Make everygreen. 2013-12-06 11:21:33 +01:00
dosire d277bf4bf9 Update universal guide. 2013-12-06 09:17:19 +01:00
Dmitriy Zaporozhets a2efc277cf Merge branch 'feature/project_visibility_filter' of /home/git/repositories/gitlab/gitlabhq 2013-12-06 07:52:16 +00:00
Dmitriy Zaporozhets 3b20c89005 Add visibility filter to Dashboard#projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-05 20:26:21 +02:00
Dmitriy Zaporozhets a767c13367 Merge pull request #5752 from jhollingsworth/fix/no-404-for-project 
Fix 404 on project page for unauthenticated user
 2013-12-05 07:16:45 -08:00
Dmitriy Zaporozhets e5f4c7883f Fix comment form UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-05 11:55:07 +02:00
Dmitriy Zaporozhets f6d96d354c Improve avatar block UI on profile page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-05 11:26:55 +02:00
Dmitriy Zaporozhets 41d67d1421 Merge pull request #5762 from jvanbaarsen/patch-2 
Updated README.md - Added RAILS_ENV
 2013-12-05 00:35:04 -08:00
Dmitriy Zaporozhets 6edb4c0634 Allow Cross-origin resource sharing for GitLab API 
It will allow to write web applications on other domains to interact
with GitLab instances

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-05 10:29:45 +02:00
Jeroen van Baarsen 2c15b52aec Updated README.md - Added RAILS_ENV 
Added RAILS_ENV to gitlab:test command, so the dev database wont be wiped.

fixes https://github.com/gitlabhq/gitlabhq/issues/5756#issuecomment-29876630
 2013-12-05 09:29:44 +01:00
Dmitriy Zaporozhets 12fb44e6e8 Merge pull request #5761 from gravis/patch-2 
Tiny typo
 2013-12-05 00:11:28 -08:00
Philippe Lafoucrière 4f61da6943 Tiny typo 2013-12-05 08:30:30 +01:00
Jason Hollingsworth c099074fcc Fix 404 on project page for unauthenticated user 
Eliminate a 404 error when user is not logged in and attempts to visit
a project page.

The 404 page will still show up when user is logged in and the project
doesn’t exist or the user doesn’t have access.
 2013-12-04 13:10:20 -06:00
Dmitriy Zaporozhets 23d180f5f1 Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq 2013-12-04 14:56:19 +00:00
Dmitriy Zaporozhets 4f067ae931 Merge branch 'feature/event_hooks' of /home/git/repositories/gitlab/gitlabhq 2013-12-04 13:42:06 +00:00
Dmitriy Zaporozhets d4f94a5b07 Update devise to latest version of 2.2.x 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:56:12 +02:00
Dmitriy Zaporozhets 21f4e5d3ac ProjectHook API supports new event fields 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:39 +02:00
Dmitriy Zaporozhets 822dac87ec Extract tests for project hooks API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:39 +02:00
Dmitriy Zaporozhets 882029d9c6 Expose ProjectHook attributes via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:39 +02:00
Dmitriy Zaporozhets fff69bdb97 Mention advanced project hooks in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:38 +02:00
Dmitriy Zaporozhets cf5d3bb0ad Improve help page for Project web hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:18 +02:00
Dmitriy Zaporozhets 887c0c67ac Update WebHook help page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:18 +02:00
Dmitriy Zaporozhets d4c50dbd33 Annotate web_hooks table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 5f9cdbab1d Modify test to pass new project hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets cfcf24dce5 Execute project hooks when issue or merge request created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 25951b9146 Prepare ProjectHooks to work with issues and merge_requests 
* Add event scopes to ProjectHook
* Added Issuable#to_hook_data
* Project#execute_hooks now accept hook filter as argument

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 0687ecb66d UI with event types for Project WebHooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 169b4ce0ca Add new fields to web_hooks table. 
Next fields were added:
* push_events
* issues_events
* merge_requests_events

Main goal is to create web hooks that can be triggered only for certain
event types. For example you can have separate web hook for push events
and another one for issues.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:17 +02:00
Dmitriy Zaporozhets 88bab75aa4 Merge pull request #5741 from archiloque/unused_http_url 
Unused http_url member in project & gollum_wiki
 2013-12-04 02:51:14 -08:00
Dmitriy Zaporozhets 48e2756757 Merge pull request #5755 from PlugIN73/patch-1 
Fix bug with showing create merge request button
 2013-12-04 02:48:57 -08:00
Alexander Vagin 6f0725119c Fix bug with showing create merge request button while merge request are disabled in project settings 2013-12-04 11:02:36 +03:00
Dmitriy Zaporozhets a4cbdbb10d Update rails to 3.2.16 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 09:13:09 +02:00
Jacob Vosmaer 80302a0f6f Limit the number of results in gitlab:ldap:check 2013-12-03 18:51:21 +01:00
Dmitriy Zaporozhets 640b913ac6 Modify logo a bit 2013-12-03 15:38:55 +02:00
Dmitriy Zaporozhets 16916fb103 Improve UI for stacked nav-pills 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.0.pre2 		2013-12-03 12:19:48 +02:00
Dmitriy Zaporozhets d793bceb90 Merge pull request #5733 from bke-drewb/issue-5716 
Issue 5716 - Allow removal of avatar
 2013-12-02 23:52:04 -08:00
Jacob Vosmaer aa69e29e70 Merge pull request #5610 from demosdemon/patch-1 
Add client_max_body_size to nginx site
 2013-12-02 23:29:11 -08:00