Commit Graph
7119 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ceb8f9dfeb Remove custom css for panels and navs 2015-03-06 21:15:15 -08:00
Dmitriy Zaporozhets 3cbc0b1c6d Cleanup css variables 2015-03-06 20:02:34 -08:00
Dmitriy Zaporozhets cd73b26e07 Refactor gitlab css state colors 2015-03-06 19:02:12 -08:00
Dmitriy Zaporozhets 3bfd53149c Replace bs-callout with alert 2015-03-06 18:36:22 -08:00
Dmitriy Zaporozhets 3cf4359b00 Merge branch 'mass-change-comments' into 'master'
Send notifications and leave system comments when bulk updating issues.

Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/1885.

See merge request !1646
2015-03-07 01:06:44 +00:00
Dmitriy Zaporozhets e68ad7fbb8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-06 16:13:43 -08:00
Dmitriy Zaporozhets 7dadd423d5 Merge branch 'condensed-mr-commits' into 'master'
Condense commits already in target branch when updating merge request source branch.

Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043.

![Screen_Shot_2015-03-06_at_17.17.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/8d03540b7b7294ce07005e6f3db6ed3d/Screen_Shot_2015-03-06_at_17.17.13.png)

(Not shown in screenshot, but works fine with rebases as well)

See merge request !1648
2015-03-07 00:13:10 +00:00
Douwe Maan 84ebc22ad2 Use 2 periods instead of 3 to signify inclusive range. 2015-03-06 23:12:26 +01:00
Douwe Maan 1cc41ce1ad Merge branch 'normalize-slack-hipchat-messages' into 'master'
Add tag push notifications to HipChat and Slack messages and normalize output of messages to be consistent

Add tag_push event notification to HipChat and Slack services.

For each service, normalize message output to use:
- User name instead of username
- Include first line of title in message description
- Link to "Issue #X" instead of "#X"

See merge request !370
2015-03-06 21:23:41 +00:00
Douwe Maan 663b3c968f Condense commits already in target branch when updating merge request source branch. 2015-03-06 18:09:00 +01:00
Stan Hu ad14ed5e49 Add tag_push event notification to HipChat and Slack services.
Normalize output to use:
- User name instead of username
- Include first line of title in message description
- Link to "Issue #X" instead of "#X"
2015-03-06 08:31:49 -08:00
Dmitriy Zaporozhets 0625d68f75 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-06 08:28:26 -08:00
Stan Hu 7e204cf389 Added comment notification events to HipChat and Slack services.
Supports four different event types all bundled under the "note" event type:

- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet
2015-03-06 06:54:00 -08:00
Douwe Maan b673d87227 Send notifications and leave system comments when bulk updating issues. 2015-03-06 15:01:13 +01:00
Dmitriy Zaporozhets b14d21e174 Use bootstrap buttons with custom colors instead of own css 2015-03-06 02:18:53 -08:00
Dmitriy Zaporozhets 8b53d9efe6 Fix bug with active tab remembering (saving cookie with different path) 2015-03-06 01:41:47 -08:00
Dmitriy Zaporozhets baae329172 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-05 11:39:16 -08:00
Dmitriy Zaporozhets 0092cb8f59 Merge branch 'cache-project-row' into 'master'
Cache project row on dashboard, group and user page

See merge request !1639
2015-03-05 19:38:10 +00:00
Dmitriy Zaporozhets cf4fcf2521 Merge branch 'fix-checkbox-align' into 'master'
Fix checkbox alignment in application settings

Add the form-control CSS class to the feature checkboxes on the application settings page to fix the vertical alignment with their labels.  See #2053.

Also add aria-describedby attributes to form controls that have a help text block (http://getbootstrap.com/css/#callout-help-text-accessibility).

## Before

![Admin_area___GitLab](https://dev.gitlab.org/Okada/gitlabhq/uploads/2736fe81ba564b43cbef37cd187cf47a/Admin_area___GitLab.png)

---

## After

![Admin_area___GitLab_-_after](https://dev.gitlab.org/Okada/gitlabhq/uploads/95a8a26600458c9c55bc05d2e0c6be47/Admin_area___GitLab_-_after.png)

---

This doesn't address the help text block for the twitter checkbox.  @dzaporozhets Do you want to keep the help text visible or would you rather put it in a dialog and hide it initially?

cc @sytse

See merge request !1615
2015-03-05 18:01:55 +00:00
Dmitriy Zaporozhets 38862308f0 Cache project row on dashboard, group and user page 2015-03-05 09:43:41 -08:00
Stan Hu f12ec5f4e8 Add merge and issue event notification for HipChat 2015-03-05 08:23:38 -08: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 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
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
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
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 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
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 e6a0fb1f77 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-03 11:50:21 -08: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
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
Douwe Maan 3102454a56 Don't show Unassigned in user select when searching. 2015-03-03 13:52:13 +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 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