home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,435 Commits 48 Branches 340 Tags
v6.4.0.pre3
Commit Graph
7435 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 2ca4e70894 Show MR accept info only if merge request is open 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.4.0.pre3 		2013-12-13 13:21:12 +02:00
Dmitriy Zaporozhets 9b7b27ce72 Add authenticity_token: true to multipart forms 
Rails 4 does not generate token by default
It fixes bug when you get to sign-in page after trying to upload image
with comment

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 19:05:21 +02:00
Dmitriy Zaporozhets c959143ed7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-12-12 18:31:01 +02:00
Dmitriy Zaporozhets 32e18169e8 Add support for relative url to GitLab.GfmAutoComplete.Emoji.assetBase 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 18:30:32 +02:00
Dmitriy Zaporozhets 144a25ef4d Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhq 2013-12-12 14:30:05 +00:00
Dmitriy Zaporozhets 29bfe34521 Fix emojii autocomplete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 15:31:37 +02:00
Dmitriy Zaporozhets f381308c85 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-12 15:12:12 +02:00
Dmitriy Zaporozhets 03e517e077 Merge branch 'bug/mr_duplicate_iids' of /home/git/repositories/gitlab/gitlabhq 2013-12-12 13:10:04 +00:00
Dmitriy Zaporozhets 8c5aa5e3b1 Fix test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 14:20:08 +02:00
Dmitriy Zaporozhets f1be13748b Merge pull request #5827 from Razer6/remove_rails4_travis 
Remove rails4 branch in travis configuration
 2013-12-12 02:28:44 -08:00
Dmitriy Zaporozhets cb599a09be Allow close of broken MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 12:20:54 +02:00
Dmitriy Zaporozhets 432018f84b Use MR#source_project_path method instead of merge_request.source_project.path_with_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:52:10 +02:00
Dmitriy Zaporozhets 7901d14315 Proper erro message for MR when fork removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:51:39 +02:00
Robert Schilling 5675d34316 Remove rails4 branch in travis configuration since this branch is already merged 2013-12-12 10:46:49 +01:00
Dmitriy Zaporozhets 6c3459978d Add new methods to MR to check if source or target branch exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:34:42 +02:00
Dmitriy Zaporozhets 5a4386a466 Render valid message when MR source or target branch was removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:33:57 +02:00
Dmitriy Zaporozhets 405694a5d6 do not remove merge requests when fork project destroyed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-12 11:32:16 +02:00
Dmitriy Zaporozhets 7bb2a536a0 Merge branch 'bug/at_disappear' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 17:30:49 +00:00
Jacob Vosmaer 7cb75aeb46 Reduce Fog expiration period to 17 years 2013-12-11 17:40:11 +01:00
Jacob Vosmaer 3e57d88e57 Expire fog links after 34 years 2013-12-11 17:40:11 +01:00
Dmitriy Zaporozhets 38fc5dc2a8 Fix disappearing @ when mention user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-11 18:17:08 +02:00
Dmitriy Zaporozhets 0456c66628 Merge branch 'improve/avatar_size' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 16:02:14 +00:00
Dmitriy Zaporozhets 445f31c642 Add DELETE to api cors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-11 17:59:37 +02:00
Dmitriy Zaporozhets adf559581c Merge pull request #5759 from bke-drewb/issue-5496 
Add cache expiry on avatar creation/removal
 2013-12-11 07:43:21 -08:00
Drew Blessing c26d392b1a Expire event cache on avatar creation/removal 2013-12-11 09:30:22 -06:00
Dmitriy Zaporozhets 2934e7a962 Update deploy.sh script with assets commands 2013-12-11 14:34:10 +00:00
Dmitriy Zaporozhets 0cd2ea88b3 Dashboard avatars: No need to load 40px images if we render them in 24px 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-11 16:09:23 +02:00
Dmitriy Zaporozhets 880fef0d92 Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 09:36:28 +00:00
Dmitriy Zaporozhets 74d19cc4b3 Merge pull request #5819 from jvanbaarsen/rails4 
Fixed all the confirm: deprecation warnings
 2013-12-10 23:29:12 -08:00
Dmitriy Zaporozhets 3ad6c61241 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-11 09:19:36 +02:00
Dmitriy Zaporozhets c7fd82762a Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhq 2013-12-11 07:18:40 +00:00
Jeroen van Baarsen bfacf13668 Fixed all the confirm: deprecation warnings 2013-12-10 20:33:21 +01:00
Dmitriy Zaporozhets 72f2be8666 Virtus to version 1.0.1. Bye-bye backports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 17:07:46 +02:00
Dmitriy Zaporozhets bbd8525d75 Update jasmine gem to work with rails4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 16:03:24 +02:00
Dmitriy Zaporozhets 5a2ae296fa fix observer specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 15:43:27 +02:00
Dmitriy Zaporozhets 5289190ce8 Add require for Files contexts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 14:15:08 +02:00
Jacob Vosmaer 427e68ecbe Merge pull request #5801 from Rovanion/default-doc 
Added example defaults file and appropriate documentation.
 2013-12-10 04:09:50 -08:00
Dmitriy Zaporozhets 6708a770de Even more data: confirm 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:48:00 +02:00
Dmitriy Zaporozhets 74d6e492d3 More data: confirm 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:46:50 +02:00
Dmitriy Zaporozhets 7db71b9476 Fix project models specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:41:38 +02:00
Dmitriy Zaporozhets 58eca3118a Fix markdown helper spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:38:31 +02:00
Dmitriy Zaporozhets f088c867a4 Fix signup for rails4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:35:10 +02:00
Dmitriy Zaporozhets 2ab76ca531 Fix UserProject obserse spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:24:48 +02:00
Dmitriy Zaporozhets d75eb24378 Fix more confirm deprecations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:20:54 +02:00
Dmitriy Zaporozhets 0124ae18c5 Fix User#by_username_or_id for postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 13:20:35 +02:00
Dmitriy Zaporozhets ed82ab4117 Remove some deprecations and fir project helper specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets 7c91055e4a Fix wiki editing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets 0f5f021527 Fix commits atom feed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:29 +02:00
Dmitriy Zaporozhets f3d5b565d5 fix profile tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-10 12:11:29 +02:00
Jeroen van BaarsenandDmitriy Zaporozhets 2293cb1051 Fixed some deprecations 
* Model.all is deprecacted, use without .all
* confirm: message is deprecated, needed to be wrapped
  in data block
 2013-12-10 12:11:28 +02:00