Commit Graph
605 Commits
Author SHA1 Message Date
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
2015-12-07 12:26:56 +00:00
Douwe Maan 6368717852 Merge branch 'issue_1156' 2015-12-07 12:07:22 +01:00
Anton Baklanov caa6851bf5 Fixed duplicated issue note email notifications.
Fixes #2560
2015-12-06 01:20:42 +02:00
Rubén Dávila 5e6a5270d5 Raise the exception from #execute instead of #run_hook. #1156 #3069 2015-12-03 09:39:15 -05:00
Rubén Dávila 338eb2c41e Call update hook from new GitHooksService class. #3069 2015-12-03 09:39:15 -05:00
Rubén Dávila 5145706c82 Run custom Git hooks when creating or deleting branches through the UI. #1156 2015-12-03 09:39:15 -05:00
Grzegorz Bizon ba08811d07 Move note emoji-award implementation to note model (feature envy) 2015-12-03 13:38:59 +01:00
Grzegorz Bizon 22d87b74a9 Support award-emoji notes only when it a comment for an issue 2015-12-03 13:38:59 +01:00
Douwe Maan 60828ab40e Merge branch 'master' into link-refs 2015-12-02 12:12:03 +01:00
Douwe Maan 4a292aa604 Proper cross-project references when MR is closed by issue 2015-11-30 21:36:35 +01:00
Valery Sizov e0131c5d07 Merge branch 'rails_update_to_4_2' into 'master'
Rails update to 4.2.4

https://gitlab.com/gitlab-org/gitlab-ce/issues/2694

See merge request !1902
2015-11-30 16:49:09 +00:00
Valery Sizov 461731f076 fix notification_service specs 2015-11-30 11:21:10 +02:00
Stan Hu 2f90e71fd3 Merge pull request #9670 from janten/gravatar-retina
Add support for HiDPI displays in gravatar service
2015-11-26 08:13:28 -08:00
Valery SizovandValery Sizov 7f214cee74 Migrate mailers to ActiveJob 2015-11-26 17:03:43 +02:00
Robert Speicher a2915aeb66 Rescue StandardError, not Exception 2015-11-24 16:12:25 -05:00
Douwe Maan 761bf63810 Merge branch 'issue_2296' into 'master'
Generate system note after Task item has been updated on Issue or Merge Request.

Reference: #2296 

Everytime the User check or uncheck a Task Item from the Issue or
Merge Request description, a new update is going to be
added to the activity logs of the Issue or Merge Request.

Note that when using the edit form, you can only update the Task item
status or add/delete/modify existing ones. Doing both actions is not
fully supported.

See merge request !1848
2015-11-23 13:09:34 +00:00
Robert Schilling 04a3d27eab Allow editing a release in API via PUT method 2015-11-21 22:34:53 +01:00
Robert Schilling 3ea05c5b5b Only allow to create a release if it does not exist yet 2015-11-21 22:24:34 +01:00
Robert Schilling faef95af1a API: Return 404 if the tag for a release does not exist 2015-11-21 18:08:45 +01:00
Rubén Dávila fa9f2dec0e Monkey patching TaskList::Item is no longer required. #2296 2015-11-20 10:49:12 -05:00
Rubén Dávila fc18e96db3 Refactor creation of system notes for Issue/MR labels. #2296 2015-11-20 10:36:12 -05:00
Valery Sizov f31ee52507 Fix for Emoji 2015-11-20 11:13:43 +02:00
Ruben DavilaandRubén Dávila 97afb84b31 Generate system note after Task item has been updated on Issue or Merge Request. #2296
Everytime the User check or uncheck a Task Item from the Issue or
Merge Request description, a new update is going to be
added to the activity logs of the Issue or Merge Request.

Note that when using the edit form, you can only update the Task item
status or add/delete/modify existing ones. Doing both actions is not
fully supported.
2015-11-19 21:05:44 -05:00
Kamil Trzciński 0383f84d88 Merge branch 'ci-yaml-validation' into 'master'
Commits without .gitlab-ci.yml are marked as skipped

- Commits without .gitlab-ci.yml are marked as skipped
- Save detailed error when YAML syntax

This also fixes: #3521 #3546 

/cc @jacobvosmaer 


See merge request !1827
2015-11-19 22:57:06 +00:00
Valery Sizov bdf4007cb7 adressing comments 2015-11-19 18:12:17 +02:00
Kamil Trzcinski fd6b589496 Since GitLab CI is enabled by default, remove enabling it by pushing .gitlab-ci.yml 2015-11-19 12:09:34 +01:00
Valery Sizov db91ef3a2a better regexp 2015-11-19 01:26:00 +02:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00
Douwe Maan a0519818cb Tweak code formatting. 2015-11-18 12:02:05 +01:00
Robert Speicher b1abe90aeb Merge branch 'adamliesko/gitlab-ce-notification-upon-unassignment' into 'master'
Add notification to the former assignee upon unassignment

Replaces !1769

Fixes #3395

See merge request !1818
2015-11-17 18:28:09 +00:00
Douwe Maan f008b2d2df Remove extra space 2015-11-17 17:19:31 +01:00
Douwe Maan 8c308e3df6 Don't fail when there was no previous assignee 2015-11-17 16:51:35 +01:00
Douwe Maan 1ca550823b Merge branch 'master' into adamliesko/gitlab-ce-notification-upon-unassignment 2015-11-17 16:41:42 +01:00
Dmitriy Zaporozhets 84b5d0356a Refactor similar code for Issue and MR update service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-17 12:42:43 +01:00
Dmitriy Zaporozhets 9b0efdb71e Remove code duplication in notification_service.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-17 12:05:35 +01:00
Dmitriy Zaporozhets 98d6d491b5 Move global milestone specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 14:38:34 +01:00
Dmitriy Zaporozhets 986695e136 Refactor global and group milestones logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 14:07:38 +01:00
Kamil Trzciński eaf27c6295 Merge branch 'builds_feature' into 'master'
Expose builds feature

Expose builds feature in project settings (as feature).

Enable it by default for a new projects.

I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it.

![Screen_Shot_2015-11-09_at_16.42.21](/uploads/a8af0a56fc0498688c0428ff22252d9c/Screen_Shot_2015-11-09_at_16.42.21.png)

If we are ok, I'll add feature tests for it.

/cc @sytses @dzaporozhets 




See merge request !1767
2015-11-13 17:55:16 +00:00
Dmitriy Zaporozhets f197b528ff Merge branch 'refactor-complex-methods' into 'master'
Refactor complex methods

Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50

Part of #3444 

See merge request !1794
2015-11-13 11:48:40 +00:00
Kamil Trzcinski 6384c757b7 Expose CI enable option in project features
- Enable CI by default for all new projects
2015-11-13 10:52:50 +01:00
Minsik Yoonand윤민식 3d0efa8e0a Add ignore white space option in merge request diff
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
Dmitriy Zaporozhets 857710634c Split complex method Issues::UpdateService#execute
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 00:13:45 +01:00
Dmitriy Zaporozhets 7f0b4ce16f Split complex method SystemHooksService#build_event_data
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 00:12:18 +01:00
Dmitriy Zaporozhets e5cc197a99 Split huge method MergeRequests::UpdateService#execute
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-13 00:06:42 +01:00
Dmitriy Zaporozhets 354b69dde2 Merge remote-tracking branch 'origin/release-notes'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 10:20:22 +01:00
adamliesko 798873ca75 Add notification to the former assignee upon unassignment 2015-11-09 17:26:01 +01:00
Dmitriy Zaporozhets b67fdfff3c Refactor release code a bit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-09 15:30:50 +01:00
Stan Hu 40a9b1ce00 Fix bug where manually merged branches in a MR would end up with an empty diff
Closes #3314
2015-11-05 23:47:04 -08:00
Yorick Peterse 6d91ee0095 Merge branch 'create-project-performance' into 'master'
Improve performance of creating projects



See merge request !1650
2015-11-04 10:14:30 +00:00
Ben FordandDouwe Maan 3be9d2c422 Add ability to create directories in the editor
Simply type a name with a `/` directory separator and new directories
will be created. This does not do the fancy UI work that github.com
does, but it will get the job done.

I could not find tests for file creation, so I didn't add a test for
this slight behaviour modification. I did test directory traversals
though, using both absolute paths like `/tmp/foo.txt` and relative paths
like `../../foo.txt`. Neither case escaped the repository, though
attempting to traverse with a relative path resulted in a 500 error that
did not affect application stability upon reload.
2015-10-29 15:49:07 +01:00