Commit Graph
22224 Commits
Author SHA1 Message Date
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
fabien af522ede14 Update gemnasium-gitlab-service gem 2015-03-04 16:22:26 +01: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
Patricio Cano 09dbe452e3 Corrected sentence about GitLab Flow 2015-03-03 21:44:53 -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
Patricio Cano 92b1b15f6f Corrected images paths 2015-03-03 12:38:45 -08:00
Patricio Cano 01bd632c66 Created documentation on how to fork a project. 2015-03-03 12:31:54 -08: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
Hannes Rosenögger 10212c01fd Count commits in branches as well in the commit calendar 2015-03-03 15:31:05 +01:00
Jeroen van Baarsen abc69c8905 Merge branch 'fix-merge-request-url-builder' into 'master'
Fix merge request URL passed to Webhooks

If you look at the data structure passed to Webhooks, you will see:

`"url"=>nil`

I don't think any of the Webhooks or services are using this yet, so right now nothing so far depends upon this value being correct.

See merge request !352
2015-03-03 13:18:23 +00:00
Douwe Maan 3102454a56 Don't show Unassigned in user select when searching. 2015-03-03 13:52:13 +01:00
Douwe Maan fc61608161 Fix specs. 2015-03-03 13:09:45 +01:00
Douwe Maan 3702c4ad80 Render go-import meta tag for private repos. 2015-03-03 11:22:30 +01:00
Douwe Maan d513ca584a Revert "Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx"
This reverts commit 51349ca3c8, reversing
changes made to b180476bd6.
2015-03-03 11:21:48 +01:00
Douwe Maan 2c7baed394 Fix changelog. 2015-03-03 11:20:01 +01:00
Douwe Maan 5c910b94ce Set correct object_kind on tag push data. 2015-03-03 11:14:33 +01:00
Douwe Maan d57e809cbd Set supported events per project service. 2015-03-03 11:14:32 +01:00
Douwe Maan 85fa334eb6 Execute GitlabCiService for both push and tag_push events. 2015-03-03 11:14:32 +01:00
Douwe Maan bbcb12f271 Execute tag_push services and hooks when tag is created through web UI. 2015-03-03 11:14:32 +01:00
Douwe Maan ca56d9ff9f Don't execute GitlabCiService twice for pushed tags. 2015-03-03 11:14:32 +01:00
Douwe Maan f13567edc4 Only execute GitlabCiService for push events. 2015-03-03 11:14:32 +01:00
Douwe Maan d86c0cda24 Fix specs. 2015-03-03 11:14:32 +01:00
Douwe Maan 19f04cf989 Execute services for tag push. 2015-03-03 11:14:32 +01:00
Douwe Maan d9ff616fd8 Code style, directory structure. 2015-03-03 11:14:32 +01:00
Stan HuandDouwe Maan afe5d7d209 Issue #595: Support Slack notifications upon issue and merge request events
1) Adds a DB migration for all services to toggle on push, issue, and merge events.

2) Upon an issue or merge request event, fire service hooks.

3) Slack service supports custom messages for each of these events. Other services
not supported at the moment.

4) Label merge request hooks with their corresponding actions.
2015-03-03 11:14:31 +01:00
Douwe Maan 0e11be40c3 Add tests for GrackAuth. 2015-03-03 10:49:28 +01:00
Jeroen van Baarsen dbc61cfc0b Merge pull request #8911 from AKoetsier/changelog-8501
Fixed changelog for MR 8501
2015-03-03 10:32:23 +01:00
Andrès Koetsier 6f71f5bb1b Fixed changelog for MR 8501 2015-03-03 10:28:44 +01:00
Dmitriy Zaporozhets f438791721 Fix import check for case sensetive namespaces 2015-03-02 23:06:59 -08:00
Dmitriy Zaporozhets 2f4656b5c7 Merge branch 'strict-rubocop-rules' into 'master'
Enable ParenthesesAsGroupedExpression rule

See merge request !1617
2015-03-03 05:58:14 +00:00
Dmitriy Zaporozhets d874c821b4 Merge branch 'brakeman' into 'master'
Add Brakeman - Static analysis security scanner for Ruby on Rails

See merge request !1616
2015-03-03 05:57:47 +00:00