home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,311 Commits 48 Branches 340 Tags
4f61da6943dbffb0b2461b60a8b8cdced4e52974
Commit Graph
7311 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe Lafoucrière 4f61da6943 Tiny typo 2013-12-05 08:30:30 +01: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
Drew Blessing b08608b261 Issue 5716 - Allow removal of avatar 
Add class and style

Add spinach tests

Add entry to CHANGELOG

Add entry to CHANGELOG
 2013-12-02 16:20:34 -06:00
Dmitriy Zaporozhets e411f3bab2 Small UI fixes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 17:24:03 +02:00
Dmitriy Zaporozhets 3a2c32c054 Fix broken pagination for issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 15:22:38 +02:00
Dmitriy Zaporozhets 7ecd1249d5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-02 15:08:43 +02:00
Dmitriy Zaporozhets bd0a32fb89 Merge pull request #5732 from Tandrial/patch-1 
Missing gem bundler
 2013-12-02 04:38:56 -08:00
Dmitriy Zaporozhets bc663a7383 remove GET window.updatePage method that do dataType script 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 14:33:27 +02:00
Dmitriy Zaporozhets 4f32d2e28e Remove GET .js format for Milestone controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 14:32:54 +02:00
Dmitriy Zaporozhets e3464a54d8 Remove .js format for MergeRequest controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 14:27:36 +02:00
Julien Kirch 4ab31d834e Unused http_url member in project & gollum_wiki 2013-12-02 11:13:53 +01:00
Dmitriy Zaporozhets 4e878ad902 Disable travis notifications 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-02 10:39:46 +02:00
Dmitriy Zaporozhets 31892227d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq v6.4.0.pre1 2013-12-02 09:46:37 +02:00
Dmitriy Zaporozhets df9caf0b94 Merge branch 'add-cookbook' of /home/git/repositories/gitlab/gitlabhq 2013-12-02 07:46:26 +00:00
Dmitriy Zaporozhets 98c5912aaa Merge branch 'make-gender-neutral' of /home/git/repositories/gitlab/gitlabhq 2013-12-02 07:45:50 +00:00
Dmitriy Zaporozhets 90f9c3fbc7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-02 09:34:26 +02:00
Dmitriy Zaporozhets 5fd90cd5e4 Merge pull request #5724 from Popl7/add_thumbsup_thumbsdown_emoji_voting 
Thumbsup and thumbsdown emoji should be counted when voting
 2013-12-01 23:33:48 -08:00
Dmitriy Zaporozhets dc29b23733 Merge pull request #5725 from Popl7/http_repo_link_on_public_acces 
Correct url to pull puplic repos anonymously on project page
 2013-12-01 23:33:21 -08:00
Dmitriy Zaporozhets 0da6394c41 Merge pull request #5731 from bke-drewb/helpui 
Improve Help navigation UI
 2013-12-01 23:30:38 -08:00
Sytse Sijbrandij 7f3ff69e3e Merge pull request #5737 from Popl7/type_fix_for_project_network_graph 
type_fix_for_project_network_graph
 2013-12-01 03:10:16 -08:00
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Steven Thonus e3d4eb2140 type_fix_for_project_network_graph 2013-11-30 17:27:02 +01:00
Sytse Sijbrandij 6095a1cb25 Comprehensive list of installation methods. 2013-11-30 12:39:11 +01:00
Dmitriy Zaporozhets 931e6a721f Merge branch 'relative-url-needs-warning' of /home/git/repositories/gitlab/gitlabhq 2013-11-30 08:07:36 +00:00
Dmitriy Zaporozhets 3135951640 Merge branch 'database_doc' of /home/git/repositories/gitlab/gitlabhq 2013-11-30 08:06:51 +00:00
Dmitriy Zaporozhets 946595a554 Merge branch 'line-for-side-by-side-diff' of /home/git/repositories/gitlab/gitlabhq 2013-11-30 08:05:08 +00:00
Tandrial b6e3f391e7 Update ruby.md 
Trying to install the gem bundle without bundler fails with:
/usr/local/lib/ruby/2.0.0/rubygems/dependency.rb:296:in `to_specs': Could not find 'bundler' (>= 0) among 8 total gem(s) (Gem::LoadError)
        from /usr/local/lib/ruby/2.0.0/rubygems/dependency.rb:307:in `to_spec'
        from /usr/local/lib/ruby/2.0.0/rubygems/core_ext/kernel_gem.rb:47:in `gem'
        from /usr/local/bin/bundle:22:in `<main>'

Installing the bundler (with sudo gem install bundler) at the end of Step 4 fixes this.
 2013-11-29 21:43:40 +01:00