Commit Graph
7883 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8f0a97da04 Add base64 encoding selector to new file UI so you can add image to repo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 18:25:32 +02:00
Dmitriy Zaporozhets 4f2e9fb8e5 Accept encoding attribute in files API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 18:11:00 +02:00
Dmitriy Zaporozhets 7001ad2dda Add files encoding support on context level
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 18:10:35 +02:00
Dmitriy Zaporozhets 1d497a127b Mention base64 encoding for files API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 18:09:58 +02:00
Dmitriy Zaporozhets 21bc41c6ee Add support of base64 encoded content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 18:02:09 +02:00
Dmitriy Zaporozhets dba982403b Merge pull request #6061 from zzet/patch-8
Fix deprecation in specs
2014-01-16 02:28:31 -08:00
Dmitriy Zaporozhets de68dd2601 Merge pull request #6062 from skv-headless/fix_n+1_user_page
fix n+1 problem for namespaces
2014-01-16 02:28:01 -08:00
Dmitriy Zaporozhets 3d743d4567 Merge branch 'custom_password_length' into 'master'
Document how to customize password length limits
2014-01-16 10:25:47 +00:00
Dmitriy Zaporozhets 5437c3ea1e Merge branch 'new-branch-usability' into 'master'
Improve usability of new branch form
2014-01-16 10:22:00 +00:00
Dmitriy Zaporozhets e3f436dc43 Merge branch 'refactoring/issues_filter' into 'master'
Refactoring: Issues/MR filtering logic

Move all issues, mr filtering logic into FilteringService
2014-01-16 10:21:21 +00:00
Dmitriy Zaporozhets 70f17624dc Merge branch '6-4-update-guide' into 'master'
Improve 6-4 update guide
2014-01-16 10:14:48 +00:00
Dmitriy Zaporozhets 206741f0a3 Merge branch 'webhook_verify_none' into 'master'
Disable SSL peer verification for all webhooks

SSL peer verification was silently enabled by the HTTParty upgrade in 8a54fda459.
This patch restores the previous behaviour of GitLab 6.3 and earlier.
2014-01-16 10:13:00 +00:00
dosire d015bb322f New branch doesn't exist yet. 2014-01-16 11:05:55 +01:00
Dmitriy Zaporozhets 4416b57f90 Merge branch 'say-media-mention' into 'master'
Say Media Mention

Sponsorship message for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/388/diffs
2014-01-16 09:43:38 +00:00
Dmitriy Zaporozhets fd688f8916 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-16 11:42:10 +02:00
Dmitriy Zaporozhets 974281d140 FilteringService works with scope :all event if current user is not defined
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-16 11:40:33 +02:00
Dmitriy Zaporozhets 50b6a6d1c9 Merge pull request #6065 from jvanbaarsen/github-email-fix
Always ask for email with github omniauth
2014-01-16 01:24:18 -08:00
Sytse Sijbrandij 4a3bbc238c Merge pull request #6048 from jvanbaarsen/patch-2
Added webbrowser requirements
2014-01-16 00:14:42 -08:00
dosire 708ae96dd7 Add second sponsorship message, perfect world. 2014-01-16 08:39:49 +01:00
Dmitriy Zaporozhets a77dfc464b Remove unnecessary spec 2014-01-15 20:55:23 +02:00
Dmitriy Zaporozhets 4e96b1759c Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 18:43:30 +00:00
Jeroen van Baarsen 02d9fa2974 Added webbrowser requirements
Fixes https://github.com/gitlabhq/gitlabhq/issues/4319
2014-01-15 19:01:04 +01:00
Jeroen van Baarsen 7d3363954e Always ask for email with github omniauth
Fixes: #2061

Fix was proposed on twitter by: neic0, in the following tweet:
https://twitter.com/neic0/status/423138339806392320
2014-01-15 18:52:52 +01:00
dosire 92c5682268 Replace hints with text that is obviously not valid. 2014-01-15 16:16:07 +01:00
Dmitriy Zaporozhets 4e2c34d81b Test hook properly
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:38:48 +02:00
Dmitriy Zaporozhets 46997c6a89 Remove unnecessary contexts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:32:56 +02:00
Dmitriy Zaporozhets 234b86c97f Use FilteringService for project issuus, mrs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:32:44 +02:00
Dmitriy Zaporozhets 4a5e4b18f5 Specs for FilteringService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:32:07 +02:00
Jacob Vosmaer 5ae0d61d0a Disable SSL peer verification for all webhooks
SSL peer verification was silently enabled by the HTTParty upgrade in
8a54fda459. This patch restores the
previous behaviour of GitLab 6.3 and earlier.
2014-01-15 15:29:22 +01:00
Dmitriy Zaporozhets 6153aa1360 Use FilteringService for Dashboard, Group pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:16:45 +02:00
Dmitriy Zaporozhets 5e96ee341c Implement FilteringService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:16:23 +02:00
Dmitriy Zaporozhets 7bcd112a29 Fix commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 15:31:49 +02:00
Dmitriy Zaporozhets 1fc42d9934 Merge branch 'improve/notification' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 13:07:19 +00:00
Dmitriy Zaporozhets f19cdee8cc Remove commit_load_context.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 15:06:12 +02:00
Dmitriy Zaporozhets 8bfc62fb8b Convert TestHookContext into TestHookService. Added tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 14:38:50 +02:00
Dmitriy Zaporozhets 37ef33cba1 Use instance methods for system_hooks_service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 14:26:05 +02:00
Dmitriy Zaporozhets 2e7abbd66c Move repo rename email to notification service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 14:03:52 +02:00
Dmitriy Zaporozhets 065d9c22fa Customize merge commit message in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 13:36:53 +02:00
skv 2f55d0b6be fix n+1 problem for namespaces 2014-01-15 15:23:47 +04:00
Andrew Kumanyaev f9780eeeca Fix deprecation in specs
From https://github.com/gitlabhq/gitlabhq/pull/6053
2014-01-15 14:00:11 +03:00
Dmitriy Zaporozhets 38d8d749d7 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 10:36:12 +00:00
Dmitriy Zaporozhets 9a1d0c1739 Merge pull request #6050 from jvanbaarsen/regex-fix
Allow . files to be created
2014-01-14 13:59:46 -08:00
Dmitriy Zaporozhets fb0b932937 Revert "Fix deprecation in specs"
This reverts commit 414ead57ee.
2014-01-14 23:55:51 +02:00
Dmitriy Zaporozhets 3efbdbfda6 Increase max height of select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 21:52:39 +02:00
Dmitriy Zaporozhets d87d46f9d9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-14 21:45:51 +02:00
Dmitriy Zaporozhets eba8aa742c More styling to select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 21:45:20 +02:00
Sytse Sijbrandij a809dbf51e Merge pull request #6056 from nburkley/patch-2
Fixing Link to Contributing guide
2014-01-14 11:24:42 -08:00
Dmitriy Zaporozhets ea9ea3fe92 Move sort dropdown to the right
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 21:15:17 +02:00
Dmitriy Zaporozhets e19d05ddd6 Fix issues selects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 21:07:59 +02:00
nburkley ff8f8eae9c Fixing Link to Contributing guide
Link was a 404, added missing '/' in url
2014-01-14 19:58:47 +01:00