Commit Graph
4720 Commits
Author SHA1 Message Date
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 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
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
Tom de Bruijn 2767abd90d Clearfix on well-lists. Pages affected:
Pages affected:
- admin/groups#show
- admin/projets#index
- admin/users#index
- dashboard/issues#index (on small screens)
2014-03-20 13:31:55 +01:00
Dmitriy Zaporozhets 4f167ea00e Merge branch 'oauth-require-public-email' into 'master'
Oauth Require Public Email

Does not fix #976 yet, but will reduce the amount of users getting 422 immensly.
2014-03-20 11:55:55 +00:00
Sytse Sijbrandij ad3acff409 Merge pull request #6469 from mojavelinux/master
Add .adoc file extension for AsciiDoc
2014-03-19 16:07:38 +01:00
Sytse Sijbrandij 6b522bf950 Merge pull request #6457 from lol768/patch-1
Fix registration error info typo
2014-03-19 16:06:31 +01:00
Job van der Voort 622bbf9629 line break 2014-03-19 14:07:42 +01:00
Job van der Voort 0e31cb40d3 require public email with oauth provider message 2014-03-19 14:01:13 +01:00
Dmitriy Zaporozhets 1921a934a9 Add room placeholder for Slack integration
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-19 14:42:13 +02:00
Dmitriy Zaporozhets c1fd25ce6e Replace turbolink spinner with nprogress
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-19 12:59:23 +02:00
Dmitriy Zaporozhets d7b5656dab Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-19 09:37:14 +02:00
Federico Ravasio e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +01:00
Marin Jankovski a740e2d6d1 Do not allow password reset for ldap user. 2014-03-18 12:25:49 +01:00
Dmitriy Zaporozhets 493c7a6147 Merge branch 'links_within_same_repo' into 'master'
Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
2014-03-17 14:06:08 +00:00
Dmitriy Zaporozhets de855e2420 Default value for Snippet#private
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17 15:50:16 +02:00
Marin Jankovski f04d5bfaf6 Wiki will show relative links related to the wiki gollum repository. 2014-03-17 13:06:19 +01:00
Marin Jankovski 55e2f353d4 Link to blob instead of linking to wiki. 2014-03-17 13:05:20 +01:00
Ciro Santillli 548f070f0e Show link to public projects for new users. 2014-03-17 13:02:04 +01:00
Dmitriy Zaporozhets 66a484c9cd Merge branch 'improve-project-lookup' into 'master'
Improve Project Lookup

Fixes #1080
2014-03-15 06:27:15 +00:00
Dmitriy Zaporozhets 7c5320d2c8 Merge branch 'snippets-page' into 'master'
Render 404 instead of 500 if trying to see snippets of unexisting user

Fixes #1087
2014-03-14 21:10:12 +00:00
Dmitriy Zaporozhets f84d015fa9 Fix commit comment count css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 23:09:43 +02:00
Dmitriy Zaporozhets 25f68a71d6 Project must have namespace for Project#find_with_namespace
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 15:58:10 +02:00
Dmitriy Zaporozhets a39eeba1dc Render 404 instead of 500 if trying to see snippets of unexisting user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 15:55:41 +02:00
Dmitriy Zaporozhets 17a9ecf8cf Remove confusing code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 14:43:50 +02:00
Dmitriy Zaporozhets e07b2f527f Fix global search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 14:41:28 +02:00
Marin Jankovski f3ceebad42 Ignore newlines per md standard. 2014-03-14 12:33:03 +01:00