Commit Graph
14562 Commits
Author SHA1 Message Date
Stan Hu f12ec5f4e8 Add merge and issue event notification for HipChat 2015-03-05 08:23:38 -08:00
Dmitriy Zaporozhets 6296f65d65 Merge branch 'collapsed-projects-list' into 'master'
Improve projects list

* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button

For #2069

See merge request !1636
2015-03-05 03:34:55 +00:00
Dmitriy Zaporozhets d07b2e09fe Merge branch 'timeout' into 'master'
Increase timeout for Git-over-HTTP requests.

Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232.

Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty.

The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`.

See merge request !1619
2015-03-05 02:28:58 +00:00
Dmitriy Zaporozhets 7b9b9f704e Fix project create link on group page 2015-03-04 18:26:49 -08:00
Dmitriy Zaporozhets 65105ff3bb Improve projects list
* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button
2015-03-04 17:22:55 -08:00
Dmitriy Zaporozhets 694ac54862 Merge branch 'update-spring' into 'master'
Update spring to 1.3.3

See merge request !1635
2015-03-05 00:16:50 +00:00
Dmitriy Zaporozhets 7a8fcc738b Merge branch 'annotate-models' into 'master'
Re-annotate models

See merge request !1634
2015-03-04 23:59:55 +00:00
Dmitriy Zaporozhets 94229f24c7 Update spring to 1.3.3 2015-03-04 15:10:31 -08:00
Douwe Maan 516bcabbf4 Increase timeout for Git-over-HTTP requests. 2015-03-04 23:20:47 +01:00
Dmitriy Zaporozhets 66c61f023b Re-annotate models 2015-03-04 14:14:00 -08:00
Dmitriy Zaporozhets 63178a9509 Merge branch 'add-more-slack-notifications' into 'master'
Add more Slack notifications for issue and merge request events

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 by Stan Hu.

See merge request !1556
2015-03-04 21:57:17 +00:00
Marin Jankovski 00778c0731 Move items to the correct version in the changelog. 2015-03-04 13:45:27 -08:00
Marin Jankovski 02f17ce1b3 Update changelog. 2015-03-04 13:44:11 -08:00
Marin Jankovski 46f9417324 Update the Changelog. 2015-03-04 13:43:52 -08:00
Dmitriy Zaporozhets 21d660a591 Merge branch 'web_hook_extend' into 'master'
Web Hook sends email of pusher

See merge request !1630
2015-03-04 21:42:31 +00:00
Marin Jankovski 67eb6e9221 Merge branch 'changelog-fix' into 'master'
Add Service Templates to CHANGELOG

See merge request !1633
2015-03-04 21:41:58 +00:00
Dmitriy Zaporozhets c2ac790de6 Merge branch 'triage-link' into 'master'
Advise on how to help others.

See merge request !1632
2015-03-04 21:36:53 +00:00
Dmitriy Zaporozhets 21a6944b15 Merge branch 'bump_gitlab_git' into 'master'
Bump gitlab_git to rc15

For #2033

See merge request !1631
2015-03-04 21:35:21 +00:00
Patricio Cano 52211ea72a Added Service Templates to CHANGELOG and fixed typo. 2015-03-04 12:00:53 -08:00
Sytse Sijbrandij c842c45283 Advise on how to help others. 2015-03-04 11:24:14 -08:00
Dmitriy Zaporozhets e916f1c295 Merge branch 'dashboard-milestones' into 'master'
Add dashboard milestones.

Closes #1422.

![Screen_Shot_2015-03-03_at_16.20.36](https://dev.gitlab.org/gitlab/gitlabhq/uploads/795b480a2552e1d26436c3db2158cb81/Screen_Shot_2015-03-03_at_16.20.36.png)

See merge request !1621
2015-03-04 19:12:47 +00:00
Dmitriy Zaporozhets 61acaff5a1 Bump gitlab_git to rc15 2015-03-04 10:49:48 -08:00
Dmitriy Zaporozhets 7f97c320f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-04 10:48:42 -08:00
Valery Sizov 3d9a766d9f Web Hook sends email of pusher 2015-03-04 20:29:25 +02:00
Robert Schilling ba215e9cd5 Merge branch 'connect_gitlab_buttons_doc' into 'master'
Connect GitLab buttons doc

The "GitLab buttons in Gmail" documentation was not linked from anywhere else.

Instead of assuming that these docs are not current, or should not be accessible, I've linked to them from doc/integrations/README.md.

If linking is the less desirable approach, please advise.

See merge request !339
2015-03-04 15:52:52 +00:00
Ewan Edwards 535a3fa470 Merge branch 'connect_gitlab_buttons_doc' of gitlab.com:perforce/gitlab-ce into connect_gitlab_buttons_doc 2015-03-04 07:25:06 -08:00
Ewan Edwards fe6fb32fe6 Moved the Gmail integration line into the list of available integrations. 2015-03-04 07:24:36 -08:00
Ewan Edwards f04847a3c7 The "GitLab buttons in Gmail" document was not linked from anywhere
else. It is now linked.
2015-03-04 07:24:12 -08:00
Douwe Maan 53aec08d02 Add changelog entry. 2015-03-04 10:13:16 +01:00
Marin Jankovski 8be36a2c0f Merge branch 'autosave-new-issuables' into 'master'
Autosave title and description of new issues/MRs.

Closes #2048.

See merge request !1595
2015-03-04 06:38:55 +00:00
Marin Jankovski 8e7e77e4b6 Merge branch 'commits_statistic' into 'master'
Commits statistic grammar

Fixes #2089

Changed spelling from Commits statistic to Commit statistics

See merge request !1625
2015-03-04 06:32:12 +00:00
Marin Jankovski 094f4895db Merge branch 'build_page_text' into 'master'
Changed to 'View Build Page'

Fixes #2093

Changes 'Build Page' to 'View build page'

See merge request !1626
2015-03-04 06:31:04 +00:00
Dmitriy Zaporozhets f24e46b8f0 Remove pull-review badge since we dont use it 2015-03-03 21:59:43 -08:00
Sabba PetriandMarin Jankovski b5ec0d6d45 Spelling change Commit Statistics 2015-03-03 20:38:42 -08:00
Sabba PetriandMarin Jankovski dc7c90f132 Changed casing 2015-03-03 20:37:56 -08:00
Sabba PetriandMarin Jankovski 443cf97231 Changed to 'View Build Page' 2015-03-03 20:37:56 -08:00
Marin Jankovski 3d6d0e1e77 Merge branch 'fix-namespace-merge-request-url' into 'master'
Fix namespace in merge request url building

Changes in 42387b733b now require namespace specification and broke abc69c8905.

There are additional helper functions in c530ca00b0, but this seemed easier not to rely on them.

See merge request !363
2015-03-04 01:08:52 +00:00
Stan Hu 2088cee935 Fix URL builder to use GitlabRoutingHelper 2015-03-03 15:57:28 -08:00
Marin Jankovski 66fa4b09ed Merge branch 'fix-edit-note-with-votes' into 'master'
Fix server error when editing a note to "+1" or "-1"

### Summary

If a user edits a comment with "+1" or "-1" in the beginning, the POST returns an Internal Server error. (issue #1151). This merge request resolves that error.

### Steps to reproduce

1. Comment on an issue with "Test comment".
2. Edit the issue.
3. Write "+1" and click "Save Comment".

### Expected behavior

The edited note should be saved and refreshed. Any previous upvotes/downvotes from the user should contain a strikethrough.

### Observed behavior

Internal Error

### Relevant logs

```
Started PUT "/avocode/avocode-manager/notes/4996" for 185.33.136.107 at 2015-02-28 17:11:53 +0100
Processing by Projects::NotesController#update as JS
Parameters: {"utf8"=>"✓", "authenticity_token"=>"*removed*", "note"=>{"note"=>"+1\r\n\r\nYes"}, "commit"=>"Save Comment", "project_id"=>"avocode/avocode-manager", "id"=>"4996"}
Completed 500 Internal Server Error in 86ms
ActionView::Template::Error (undefined method `each' for nil:NilClass):
28: %span.note-last-update
29: = note_timestamp(note)
30:
31: - if note.superceded?(@notes)
32: - if note.upvote?
33: %span.vote.upvote.label.label-gray.strikethrough
34: %i.fa.fa-thumbs-up
app/models/note.rb:495:in `superceded?'
app/views/projects/notes/_note.html.haml:31:in `_app_views_projects_notes__note_html_haml___812277000516355462_69988235638820'
app/controllers/projects/notes_controller.rb:71:in `note_to_html'
app/controllers/projects/notes_controller.rb:103:in `render_note_json'
app/controllers/projects/notes_controller.rb:39:in `block (2 levels) in update'
app/controllers/projects/notes_controller.rb:38:in `update'
```

### Fix

It turns out no tests were present for the "Edit Issue" functionality. I added spinach tests to exercise this and reproduced the error.

Most of the routes in `notes_controller.rb` appear to render all notes for the given discussion. `_form.html.haml` needs the full list of notes commented by the user to add strikethroughs for older upvotes/downvotes. However, only the `index` route appeared to obtain this information. The fix is to add a `before_filter` to obtain all the user's notes beforehand, except in the delete case where this information is not needed.

Things to watch: `NotesFinder` needs `target_type` and `target_id` to determine what to do. I'm not sure if there is a conscious effort to phase these keywords out in favor of `noteable_type` and `noteable_id`.

See merge request !360
2015-03-03 21:57:00 +00:00
Dmitriy Zaporozhets 8c47a72a4e Merge branch 'project-existence-leak' into 'master'
Don't leak information about private project existence via Git-over-SSH/HTTP.

Fixes #2040 and https://gitlab.com/gitlab-org/gitlab-ce/issues/343.

Both `Grack::Auth` (used by Git-over-HTTP) and `Api::Internal /allowed` (used by gitlab-shell/Git-over-SSH) now return a generic "Not Found" error when the project exists but the user doesn't have access to it.

See merge request !1578
2015-03-03 20:05:12 +00:00
Marin Jankovski a7fad44bd3 Merge branch 'go-import' into 'master'
Render go-import meta tag for private repos.

The previously solution (626f5bab35) required a change to nginx config and broke visits from Googlebot and other clients including "go" in their user agent.

See merge request !1587
2015-03-03 19:53:20 +00:00
Marin Jankovski c5b66532df Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-03 11:50:30 -08:00
Marin Jankovski e6a0fb1f77 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-03 11:50:21 -08:00
Dmitriy Zaporozhets 4697daf71a Merge branch 'installtion-from-source' into 'master'
Clearly mark it as installation from source.

See merge request !1622
2015-03-03 19:16:52 +00:00
Dmitriy Zaporozhets d5d19a9fae Merge branch 'user-select-unassigned' into 'master'
Don't show Unassigned in user select when searching.

Fixes #2056.

When a search term is present, the Unassigned item isn't rendered, so the highlighted item is the first search result and hitting Enter works as expected.

See merge request !1620
2015-03-03 19:08:57 +00:00
Dmitriy Zaporozhets 93a21183a0 Merge branch 'case-sensetivity-import' into 'master'
Fix import check for case sensetive namespaces

If you already have namespace `ABc` and you try to import project with namespace `abC` - import will fail with 422 error.

cc @valery

See merge request !1618
2015-03-03 18:57:49 +00:00
Sytse Sijbrandij 3ff7189738 Clearly mark it as installation from source. 2015-03-03 10:01:49 -08:00
Jeroen van Baarsen c1fc29e1f8 Merge branch 'commit_calendar_branches' into 'master'
Count commits in branches as well in the commit calendar

This MR fixes a small bug in the commit calendar.
Currently only commits that are in the master branch are counted.
With this change, commits in other branches are included as well.

fixes one of the issues found in #1162

See merge request !362
2015-03-03 15:53:02 +00:00
Ewan Edwards 4ecfcb4a1e Moved the Gmail integration line into the list of available integrations. 2015-03-03 07:38:38 -08:00
Douwe Maan fbc3cb69c3 Add dashboard milestones. 2015-03-03 16:19:37 +01:00