Commit Graph
3922 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets be3edeb6a1 Small UI improvements after css refactoring 2015-03-07 10:35:17 -08:00
Dmitriy Zaporozhets e2b8025abe Increase input padding and fit issue form in laptop screen 2015-03-07 01:06:16 -08:00
Dmitriy Zaporozhets 433b4c76fc Apply some styles from flatly theme 2015-03-07 00:28:53 -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
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 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
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 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 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
Douwe Maan fbc3cb69c3 Add dashboard milestones. 2015-03-03 16:19:37 +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 d57e809cbd Set supported events per project service. 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
Dmitriy Zaporozhets 704d21f517 Merge branch 'cirosantilli-link-to-button' into 'master'
Cirosantilli link to button

For https://github.com/gitlabhq/gitlabhq/pull/7912

See merge request !1614
2015-03-03 00:46:44 +00:00
Vinnie Okada 38c52b1be6 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.  Also add aria-describedby attributes to form controls that have
a help text block.
2015-03-02 16:36:07 -07:00
Dmitriy Zaporozhets 3087be1be7 Merge branch 'less-sql-queries' into 'master'
Reduce amount of sql queries on dashboard projects page

For https://github.com/gitlabhq/gitlabhq/issues/7218

See merge request !1613
2015-03-02 23:30:27 +00:00
Dmitriy Zaporozhets 519ca7bae9 Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button
Conflicts:
	app/views/shared/_issuable_filter.html.haml
2015-03-02 15:28:22 -08:00
Stan Hu b8c9257fb1 Fix bug where editing a comment with "+1" or "-1" would cause a server error
Closes #1151
2015-03-02 15:26:00 -08:00
Dmitriy Zaporozhets 12581f15ee Merge pull request #7473 from sodabrew/patch-1
Improve login screen when only OmniAuth providers are enabled
2015-03-02 15:18:59 -08:00
Dmitriy Zaporozhets 643afcbe00 Reduce amount of sql queries on dashboard projects page 2015-03-02 14:02:09 -08:00
Dmitriy Zaporozhets ed3bd155fc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-02 13:45:46 -08:00
Marin Jankovski dae8f2faeb Merge branch 'create_issue_header' into 'master'
New Issue Header

Fixes #2073

- I've switched it from "New Issue" to "Create Issue". Small change, but grammatically correct.

See merge request !1611
2015-03-02 20:58:38 +00:00
Sabba Petri a41b9533fe Changed to "Create Issue" 2015-02-27 16:24:05 -08:00
Sabba Petri df2353716b Changed header to Create New Issue 2015-02-27 16:22:53 -08:00
Mlanawo Mbechezi 9e4d3f328f fix typo 2015-02-27 22:49:40 +01:00
Dmitriy Zaporozhets 42387b733b Merge branch 'route-helper' into 'master'
Introduce shortcuts for routing helpers

See merge request !1600
2015-02-27 07:03:01 +00:00
Marin Jankovski fc7f3bf8a1 Merge branch 'small_profile_changes' into 'master'
Fixes grammatical consistency and small changes

This commit adds consistency to small things like periods, commas,
and gives additional information to buttons and headers, etc.

Fixes #2002, #2005, #2003.

See merge request !1570
2015-02-26 19:38:24 +00:00
Dmitriy Zaporozhets b510223e7f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into route-helper 2015-02-26 09:34:35 -08:00
Douwe Maan d3c44b1a6c Fix import status page project links for new Rails. 2015-02-26 09:50:43 +01:00
Dmitriy Zaporozhets e993b59b7d Dont render project entity 2015-02-25 19:53:45 -08:00
Dmitriy Zaporozhets 128012dba8 More use of shortcut routes 2015-02-25 19:50:01 -08:00
Dmitriy Zaporozhets 1da71cc520 Introduce shortcuts for routing helpers 2015-02-25 19:34:16 -08:00
Dmitriy Zaporozhets 0d884ff2b1 Merge branch 'extend_markdown_upload' into 'master'
Generalizes image upload in drag and drop in markdown to all files

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.

- [x] Rebase on master when !1553 is merged in

See merge request !1530
2015-02-25 23:36:03 +00:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import'
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
2015-02-25 09:21:45 -08:00
Douwe Maan 5f7a3e1bbd Merge branch 'master' into extend_markdown_upload
# Conflicts:
#	app/controllers/files_controller.rb
2015-02-25 11:59:25 +01:00
Dmitriy Zaporozhets a30a56634d Merge branch 'refactor-header' into 'master'
UI: refactor header css

See merge request !1591
2015-02-25 07:56:28 +00:00
Dmitriy Zaporozhets 878e86bf64 Remove unnecessary theme_type from body class 2015-02-24 23:26:32 -08:00
Dmitriy Zaporozhets 6e559be6c6 Refactor header logo and setup expectation on it size 2015-02-24 22:58:47 -08:00
Dmitriy Zaporozhets f43c0429c2 Improve admin projects and users pages for mobile devices 2015-02-24 21:31:54 -08:00