Commits · 6edb4c0634740e4231e5939b13fd696b6823b3de · Boxiang Sun / gitlab-ce

05 Dec, 2013 1 commit

Allow Cross-origin resource sharing for GitLab API · 6edb4c06

Dmitriy Zaporozhets authored Dec 05, 2013

It will allow to write web applications on other domains to interact
with GitLab instances
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

6edb4c06

04 Dec, 2013 19 commits
- Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq · 23d180f5
  Dmitriy Zaporozhets authored Dec 04, 2013
  
  23d180f5
- Merge branch 'feature/event_hooks' of /home/git/repositories/gitlab/gitlabhq · 4f067ae9
  Dmitriy Zaporozhets authored Dec 04, 2013
  
  4f067ae9
- Update devise to latest version of 2.2.x · d4f94a5b
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d4f94a5b
- ProjectHook API supports new event fields · 21f4e5d3
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  21f4e5d3
- Extract tests for project hooks API · 822dac87
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  822dac87
- Expose ProjectHook attributes via API · 882029d9
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  882029d9
- Mention advanced project hooks in CHANGELOG · fff69bdb
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fff69bdb
- Improve help page for Project web hooks · cf5d3bb0
  Dmitriy Zaporozhets authored Dec 03, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cf5d3bb0
- Update WebHook help page · 887c0c67
  Dmitriy Zaporozhets authored Dec 03, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  887c0c67
- Annotate web_hooks table · d4c50dbd
  Dmitriy Zaporozhets authored Dec 03, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d4c50dbd
- Modify test to pass new project hooks · 5f9cdbab
  Dmitriy Zaporozhets authored Dec 03, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5f9cdbab
- Execute project hooks when issue or merge request created · cfcf24dc
  Dmitriy Zaporozhets authored Dec 03, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cfcf24dc
- Prepare ProjectHooks to work with issues and merge_requests · 25951b91
  Dmitriy Zaporozhets authored Dec 03, 2013
```
* 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>
```
  25951b91
- UI with event types for Project WebHooks · 0687ecb6
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0687ecb6
- Add new fields to web_hooks table. · 169b4ce0
  Dmitriy Zaporozhets authored Dec 02, 2013
```
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>
```
  169b4ce0
- Merge pull request #5741 from archiloque/unused_http_url · 88bab75a
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Unused http_url member in project & gollum_wiki
```
  88bab75a
- Merge pull request #5755 from PlugIN73/patch-1 · 48e27567
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Fix bug with showing create merge request button
```
  48e27567
- Fix bug with showing create merge request button while merge request are... · 6f072511
  Alexander Vagin authored Dec 04, 2013
```
Fix bug with showing create merge request button while merge request are disabled in project settings
```
  6f072511
- Update rails to 3.2.16 · a4cbdbb1
  Dmitriy Zaporozhets authored Dec 04, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a4cbdbb1
03 Dec, 2013 5 commits
- Limit the number of results in gitlab:ldap:check · 80302a0f
  Jacob Vosmaer authored Dec 03, 2013
  
  80302a0f
- Modify logo a bit · 640b913a
  Dmitriy Zaporozhets authored Dec 03, 2013
  
  640b913a
- Improve UI for stacked nav-pills · 16916fb1
  Dmitriy Zaporozhets authored Dec 03, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  16916fb1
- Merge pull request #5733 from bke-drewb/issue-5716 · d793bceb
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Issue 5716 - Allow removal of avatar
```
  d793bceb
- Merge pull request #5610 from demosdemon/patch-1 · aa69e29e
  Jacob Vosmaer authored Dec 02, 2013
```
Add client_max_body_size to nginx site
```
  aa69e29e
02 Dec, 2013 15 commits
- Issue 5716 - Allow removal of avatar · b08608b2
  Drew Blessing authored Dec 02, 2013
```
Add class and style

Add spinach tests

Add entry to CHANGELOG

Add entry to CHANGELOG
```
  b08608b2
- Small UI fixes · e411f3ba
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e411f3ba
- Fix broken pagination for issues · 3a2c32c0
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3a2c32c0
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 7ecd1249
  Dmitriy Zaporozhets authored Dec 02, 2013
  
  7ecd1249
- Merge pull request #5732 from Tandrial/patch-1 · bd0a32fb
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Missing gem bundler
```
  bd0a32fb
- remove GET window.updatePage method that do dataType script · bc663a73
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  bc663a73
- Remove GET .js format for Milestone controller · 4f32d2e2
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4f32d2e2
- Remove .js format for MergeRequest controller · e3464a54
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e3464a54
- Unused http_url member in project & gollum_wiki · 4ab31d83
  Julien Kirch authored Dec 02, 2013
  
  4ab31d83
- Disable travis notifications · 4e878ad9
  Dmitriy Zaporozhets authored Dec 02, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4e878ad9
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 31892227
  Dmitriy Zaporozhets authored Dec 02, 2013
  
  31892227
- Merge branch 'add-cookbook' of /home/git/repositories/gitlab/gitlabhq · df9caf0b
  Dmitriy Zaporozhets authored Dec 02, 2013
  
  df9caf0b
- Merge branch 'make-gender-neutral' of /home/git/repositories/gitlab/gitlabhq · 98c5912a
  Dmitriy Zaporozhets authored Dec 02, 2013
  
  98c5912a
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 90f9c3fb
  Dmitriy Zaporozhets authored Dec 02, 2013
  
  90f9c3fb
- Merge pull request #5724 from Popl7/add_thumbsup_thumbsdown_emoji_voting · 5fd90cd5
  Dmitriy Zaporozhets authored Dec 01, 2013
```
Thumbsup and thumbsdown emoji should be counted when voting
```
  5fd90cd5