Commit Graph
6502 Commits
Author SHA1 Message Date
Marin Jankovski 043c9f8640 Change Diff to Changes in views. 2014-03-26 14:00:12 +01:00
Marin Jankovski 1aabfcb92d Change the user search query to be case insensitive. 2014-03-26 12:45:39 +01:00
Andrea Usuelli d21ad74146 Changed the notification sender username to GitLab in Slack Notifier 2014-03-26 10:58:51 +01:00
Dmitriy Zaporozhets c818712dfa Reduce comments font size for events feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-26 11:13:06 +02:00
Dmitriy Zaporozhets 92ca779ebc Improve comment header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-26 10:55:04 +02:00
Dmitriy Zaporozhets 0a05c8dd8d Improve md typography
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-26 10:45:22 +02:00
Dmitriy Zaporozhets fb74d4a948 Merge branch 'request/monospace_gfm_input' into 'master'
Use monospace fonts for GFM inputs

This is an MR for [this feedback suggestion](http://feedback.gitlab.com/forums/176466-general/suggestions/5593468-use-monospace-font-in-wiki-edit-content-textarea).

I'm not sure exactly where the best place for the fix is, but I opted for the typography.scss file.  Basically, all ``textarea.js-gfm-input`` elements are styled with ``font-family: $monospace_font;``.

*PS: this being my first MR to gitlab, I apologize if I missed any steps in the process; let me know what's missing and I'll correct it here & in future MRs*
2014-03-26 08:32:06 +00:00
Dmitriy Zaporozhets eb7a986800 Merge branch 'improve_at_mentions' into 'master'
Allow at mentions for people who are not members of the project
2014-03-26 07:49:18 +00:00
Dmitriy Zaporozhets f0adf28ed9 Merge branch 'event-create-service' into 'master'
EventCreateService class

The goal is to collect all event creation logic in one place called EventCreateService.
Because now its placed in observers, controllers, services etc
2014-03-26 07:41:27 +00:00
Dmitriy Zaporozhets 05c9ab94c2 Merge branch 'refactor-author-id-of-changes' into 'master'
Remove author_id_of_changes

To prevent confusion because we already have `current_user`
2014-03-26 07:01:16 +00:00
Dmitriy Zaporozhets 7f67e066dc More compact event feed and projects list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 20:10:08 +02:00
Dmitriy Zaporozhets e421772f89 Revert "Clearfix on well-lists. Pages affected:"
Because it adds extra spaces at each project row on dashboard

This reverts commit 2767abd90d.
2014-03-25 19:53:30 +02:00
Marin Jankovski d26302215a Correct identation, default value if note doesn't exist. 2014-03-25 18:53:09 +01:00
Marin Jankovski 12c3962fc0 Search within project. 2014-03-25 18:53:09 +01:00
Marin Jankovski 0a4283b50a Extract sorting into a method. 2014-03-25 18:53:09 +01:00
Marin Jankovski eda2c0c607 Include commits. 2014-03-25 18:53:09 +01:00
Marin Jankovski 01ec6c793c At mention participating users. 2014-03-25 18:53:09 +01:00
Dmitriy Zaporozhets a5d7d125e4 Merge pull request #6577 from tombruijn/group_projects_clearfix
Clearfix on .well-list
2014-03-25 19:40:23 +02:00
Dmitriy Zaporozhets c21c3e5707 Add bottom margin to highlighed code block in comment/wiki
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 19:32:49 +02:00
Dmitriy Zaporozhets d4bfacc365 Fix MR observer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 15:16:12 +02:00
Dmitriy Zaporozhets ba87b76de1 Use EventCreateService for notes, merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 15:08:25 +02:00
Dmitriy Zaporozhets 6cc4ac7b98 Drop activity observer. User EventCreateService instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 15:07:54 +02:00
Dmitriy Zaporozhets 12d081008d Add milestone observer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 15:07:16 +02:00
Dmitriy Zaporozhets d89130b097 Collect all event creation logic in one place called EventCreateService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 14:48:02 +02:00
Dmitriy Zaporozhets f08464c055 Remove author_id_of_changes from app
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 14:01:52 +02:00
Dmitriy Zaporozhets 80daf9a777 Use current_user for Notification#merge_mr
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 13:47:48 +02:00
Dmitriy Zaporozhets e320ee3fb7 Merge branch 'humanize-over-titleize' into 'master'
Use humanize instead of titleize for MR title suggestion
2014-03-25 10:06:11 +00:00
Dmitriy Zaporozhets 0aed79b5b5 Merge branch 'improve-archived-projects' into 'master'
Proper message for archived projects at MR#show page

Fixes #940
2014-03-25 09:41:35 +00:00
Dmitriy Zaporozhets 12778fbe19 Merge pull request #6612 from Datacom/feature/print_styles_pr
Print Styles
2014-03-25 11:07:10 +02:00
Dmitriy Zaporozhets 72b13cc1be Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-25 09:04:22 +02:00
Dmitriy Zaporozhets bbca0351f7 Merge pull request #6606 from kemenaran/fix-merge-notifications
Fix the merge notification email not being sent
2014-03-25 09:03:14 +02:00
George Dewar 842ad4a425 Initial implementation 2014-03-25 15:58:16 +13:00
Dmitriy Zaporozhets 3d8ecbc94f Merge branch 'no-emails-for-mentions' into 'master'
Don't send an email for "mentioned in" notes

Currently, an email is sent every time a mentionable is referenced by an issue, a commit or a merge request: if I comment "This MR is related to #5", the watchers get one email for the comment, and another one stating "Issue #5 was mentioned by issue #13".

This is annoying — but the biggest issue is when pushing an existing branch. Every issue referenced by commit messages in this branch will get a new mention (which is fine), and dozens of emails will be sent for all these new mentions (which is not).

This commit fixes the spam by avoiding to send an email when a new mention is added to an existing mentionable. In most cases the email notification sent by the mentioner is enough.
2014-03-24 18:52:41 +00:00
Dmitriy Zaporozhets 55be026e59 Merge branch 'application-js-coffee' into 'master'
Applications js to coffee
2014-03-24 17:37:38 +00:00
Dmitriy Zaporozhets cec02067ec Merge branch 'improve-mr-form' into 'master'
Remove assignee/milestone selects from MR form

Fixes #1079 and http://feedback.gitlab.com/forums/176466-general/suggestions/5663897-merge-request-assign-to-should-popule-with-membe
2014-03-24 15:41:53 +00:00
Dmitriy Zaporozhets 394737b2cb Use humanize instead of titleize for MR title suggestion
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-24 16:15:57 +02:00
Dmitriy Zaporozhets 3ef0a625ac Applications js to coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-24 16:12:23 +02:00
Pierre de La Morinerie 65f5496e02 Fix the merge notification email not being sent
The 'author_id_of_changes' attribute is not persisted in the database.
As we retrieve the merge request from the DB just before sending the
email, this attribute was always nil.

Also there was no tests for the merge notification code - tests have
been added.

Fix #6605
2014-03-24 15:11:35 +01:00
Marin Jankovski 5e985a7eed Use emoji assets on autocomplete. 2014-03-24 14:22:11 +01:00
Dmitriy Zaporozhets eb4320cb07 Remove assignee/milestone selects from MR form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-24 15:20:29 +02:00
Dmitriy Zaporozhets 5fbf15cb88 Add proper explanation to MR in archived projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-24 15:10:21 +02:00
Robert SpeicherandDmitriy Zaporozhets a87f03768f Fix deprecation warning output
Removes the following from test output:

  DEPRECATION WARNING: It looks like you are eager loading table(s) (one
  of: merge_requests, projects) that are referenced in a string SQL
  snippet. For example:

      Post.includes(:comments).where("comments.title = 'foo'")

  Currently, Active Record recognizes the table in the string, and knows
  to JOIN the comments table to the query, rather than loading comments in
  a separate query. However, doing this without writing a full-blown SQL
  parser is inherently flawed. Since we don't want to write an SQL parser,
  we are removing this functionality. From now on, you must explicitly
  tell Active Record when you are referencing a table from a string:

      Post.includes(:comments).where("comments.title =
  'foo'").references(:comments)

  If you don't rely on implicit join references you can disable the
  feature entirely by setting
  `config.active_record.disable_implicit_join_references = true`.
2014-03-24 15:00:01 +02:00
Dmitriy Zaporozhets 12d162993e Merge pull request #6602 from dblessing/mobile_ui
Mobile UI improvements
2014-03-24 09:49:25 +02:00
Drew Blessing dab09af518 Mobile UI Improvements
Move spinner for mobile
2014-03-23 21:30:37 -05:00
awiddersheim 3704d85bc4 Remove periods from merge request
The "Merged by" and "Closed by" statements end with an extra space followed by a period. This doesn't seem necessary to me and not having the extra space followed by a period looks better to me. Also, the top of the merge request doesn't have the sentence ending with a period.
2014-03-22 16:44:13 -04:00
Ali Tavakoli 78261b4aad Set monospace font-family for textarea.js-gfm-input 2014-03-21 14:14:11 -04:00
Dmitriy Zaporozhets ac35ee3707 Merge branch 'username-keys-content-type' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-03-21 09:37:03 +02:00
Dmitry Medvinsky fefab47456 Fix /:username.keys response content type
Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.
2014-03-20 19:09:14 +04:00
Marin Jankovski 4dc09e5c1d New bindings to vote on notes. 2014-03-20 13:33:16 +01:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00