home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,928 Commits 48 Branches 340 Tags
285ed33718cc86e65dd6ef11f75aa2a42018be16
Commit Graph
8928 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 285ed33718 Merge branch 'define-feature-request' into 'master' 
Define Feature Request in Process doc
 2014-03-25 20:07:24 +00:00
dosire 74f16902cf More strict wording of the bug criteria. 2014-03-25 20:57:58 +01:00
dosire b2e7474155 Merge branch 'master' into define-feature-request 
Conflicts:
	PROCESS.md
 2014-03-25 20:57:21 +01: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
Dmitriy Zaporozhets 81527e9fba Merge pull request #6374 from zzet/patch-10 
Update merge_request_observer_spec.rb
 2014-03-25 19:41:47 +02:00
Dmitriy Zaporozhets 9afccaa8c6 Merge pull request #6554 from tsigo/remove-spork 
Remove Spork
 2014-03-25 19:40:50 +02: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 a7aacb4dc4 Merge pull request #6586 from abner/master 
added api method to return labels of a given project
 2014-03-25 19:39:16 +02:00
Dmitriy Zaporozhets 5fc3d746d2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-25 19:33:17 +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
Jacob Vosmaer 306d4ee728 Merge pull request #5935 from nmoura/patch-1 
Changed sudo by su -c in init script
 2014-03-25 15:06:54 +01: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 8bbac4576b Simplify run tests command 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 12:10:50 +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 7847e10863 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-25 12:05:37 +02: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 2677f79353 Merge branch 'sidekiq_load_check' into 'master' 
Sidekiq Load Check
 2014-03-25 08:17:21 +00:00
Dmitriy Zaporozhets 069c8a95a0 Merge branch 'external-issue-tracker-instructions' into 'master' 
External Issue Tracker Instructions
 2014-03-25 08:17:05 +00:00
Dmitriy Zaporozhets d7f1b366bb Merge branch 'no-verify-for-webhooks' into 'master' 
Inform people about the verify-none for webhooks.

Fixes #980
 2014-03-25 08:15:43 +00: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
dosire 775f686e0e Prevent discussion about is it a bug or a feature request. 2014-03-24 16:51:55 +01: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
Jacob Vosmaer 1fe07cfbae Merge branch 'attribution-for-shell-guide' into 'master' 
Attribution For Shell Guide
 2014-03-24 15:10:40 +00:00
Sytse Sijbrandij 9b8ee3e0a6 Merge branch 'advise-in-upgrade-guide-is-outdated' into 'master' 
Advise In Upgrade Guide Is Outdated
 2014-03-24 14:18:09 +00:00
dosire 369bd858d8 We should only specify unsafe version, never give advise since it it perishable. 2014-03-24 15:17:43 +01: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
Dmitriy Zaporozhets 36ea864504 Merge branch 'enable_assets_compression' into 'master' 
Add gzip compression for assets to nginx example
 2014-03-24 14:01:43 +00:00
Dmitriy Zaporozhets ad7277dfe8 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-24 15:59:53 +02:00
Marin Jankovski 8af94ed755 Add gzip compression for assets to nginx example. 2014-03-24 14:59:09 +01:00
Sytse Sijbrandij 346ce7508f Merge pull request #6440 from tomislacker/patch-1 
Update user_management.md
 2014-03-24 14:52:25 +01:00
Dmitriy Zaporozhets e0bddb64da Merge branch 'emoji_with_gzipped_assets' into 'master' 
Show emoji in autocomplete when assets gzip compression is on
 2014-03-24 13:48:26 +00:00
dosire 842c0d6b5f Can deeplink after all. 2014-03-24 14:31:35 +01:00
dosire f9a69ab1da Inform people about the verify-none for webhooks. 2014-03-24 14:22:26 +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 d66d10970d Merge pull request #6594 from tsigo/rs-small-changes 
Small changes
 2014-03-24 14:58:35 +02:00
Dmitriy Zaporozhets 92c811e8d2 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-03-24 14:56:12 +02:00
Dmitriy Zaporozhets 79f143c3f1 Merge branch 'monthly-process' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/release/monthly.md
 2014-03-24 14:55:39 +02:00
Robert Speicher 2855a799fd Remove --drb from .rspec 2014-03-24 08:55:27 -04:00
Robert Speicher 1e3b5c3787 Remove Spork 2014-03-24 08:55:27 -04:00