home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,497 Commits 48 Branches 340 Tags
48eccdb2fcfa28c2ab602b76b97ff064195bb113
Commit Graph
619 Commits
Author SHA1 Message Date
Stan Hu 8d5527007a Provide better diagnostic message upon project creation errors 
Prevents an Error 500 when project fails to create due to invalid parameters.

See #3937
 2015-12-09 09:50:16 -08:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
 2015-12-09 09:00:25 +01:00
Douwe Maan 57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +01:00
Douwe Maan 82ddd738b6 Show tooltip when trying to edit file when not on branch 2015-12-08 17:10:07 +01:00
Douwe Maan 75486f09c4 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 13:43:45 +01:00
Zeger-Jan van de Weg e7969d6f6c Satisfy Douwe Maan 2015-12-07 13:41:18 +01:00
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
Zeger-Jan van de Weg 0e96d6eb10 Merge branch 'master' into merge-if-green 2015-12-07 10:06:07 +01:00
Zeger-Jan van de Weg 46278ec7ba Button fix 2015-12-07 09:59:16 +01:00
Anton Baklanov caa6851bf5 Fixed duplicated issue note email notifications. 
Fixes #2560
 2015-12-06 01:20:42 +02:00
Zeger-Jan van de Weg 2462a96e45 Incorporate feedback 2015-12-05 15:42:38 +01: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
Zeger-Jan van de Weg a7682f8775 Specs for 'Merge When Build Succeeds' 2015-12-02 13:27:16 +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
Zeger-Jan van de Weg 8608c6325e Refactor MergeWhenBuildSucceedsService and incorporate feedback 2015-11-23 10:11:54 +01: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
Zeger-Jan van de Weg 53b285c9a8 Merge branch 'master' into merge-if-green 2015-11-18 11:58:01 +01:00
Zeger-Jan van de Weg 2f048df4a4 API support, incorporated feedback 2015-11-18 11:17:41 +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