OSDN Git Service
Dmitriy Zaporozhets [Thu, 16 Jan 2014 09:42:10 +0000 (11:42 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Thu, 16 Jan 2014 09:24:18 +0000 (01:24 -0800)]
Merge pull request #6065 from jvanbaarsen/github-email-fix
Always ask for email with github omniauth
Sytse Sijbrandij [Thu, 16 Jan 2014 08:14:42 +0000 (00:14 -0800)]
Merge pull request #6048 from jvanbaarsen/patch-2
Added webbrowser requirements
Dmitriy Zaporozhets [Wed, 15 Jan 2014 18:43:30 +0000 (18:43 +0000)]
Merge branch 'refactoring/services' of /home/git/repositories/gitlab/gitlabhq
Jeroen van Baarsen [Tue, 14 Jan 2014 16:47:12 +0000 (17:47 +0100)]
Added webbrowser requirements
Fixes https://github.com/gitlabhq/gitlabhq/issues/4319
Jeroen van Baarsen [Wed, 15 Jan 2014 17:49:39 +0000 (18:49 +0100)]
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
Dmitriy Zaporozhets [Wed, 15 Jan 2014 14:38:48 +0000 (16:38 +0200)]
Test hook properly
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 13:31:49 +0000 (15:31 +0200)]
Fix commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 13:07:19 +0000 (13:07 +0000)]
Merge branch 'improve/notification' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 15 Jan 2014 13:06:12 +0000 (15:06 +0200)]
Remove commit_load_context.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 12:38:50 +0000 (14:38 +0200)]
Convert TestHookContext into TestHookService. Added tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 12:26:05 +0000 (14:26 +0200)]
Use instance methods for system_hooks_service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 12:03:52 +0000 (14:03 +0200)]
Move repo rename email to notification service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 11:36:53 +0000 (13:36 +0200)]
Customize merge commit message in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 15 Jan 2014 10:36:12 +0000 (10:36 +0000)]
Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 14 Jan 2014 21:59:46 +0000 (13:59 -0800)]
Merge pull request #6050 from jvanbaarsen/regex-fix
Allow . files to be created
Dmitriy Zaporozhets [Tue, 14 Jan 2014 21:55:51 +0000 (23:55 +0200)]
Revert "Fix deprecation in specs"
This reverts commit
414ead57ee294618e73ef62f521b11d98fdce3a0.
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:52:39 +0000 (21:52 +0200)]
Increase max height of select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:45:51 +0000 (21:45 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:45:20 +0000 (21:45 +0200)]
More styling to select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Tue, 14 Jan 2014 19:24:42 +0000 (11:24 -0800)]
Merge pull request #6056 from nburkley/patch-2
Fixing Link to Contributing guide
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:15:17 +0000 (21:15 +0200)]
Move sort dropdown to the right
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 19:07:59 +0000 (21:07 +0200)]
Fix issues selects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
nburkley [Tue, 14 Jan 2014 18:58:47 +0000 (19:58 +0100)]
Fixing Link to Contributing guide
Link was a 404, added missing '/' in url
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:55:59 +0000 (20:55 +0200)]
Add sort dropdown to merge requests list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:55:42 +0000 (20:55 +0200)]
Move issues sort dropdown to shared partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:49:32 +0000 (20:49 +0200)]
Move issues sort logic to Issuable concern
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:31:12 +0000 (10:31 -0800)]
Merge pull request #6053 from zzet/patch-6
Fix deprecation in specs
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:30:59 +0000 (10:30 -0800)]
Merge pull request #6054 from zzet/patch-7
Remove Debug from tests
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:28:41 +0000 (20:28 +0200)]
Add login and remember_me to devise permit list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:27:19 +0000 (20:27 +0200)]
Increase width of issue filter field
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 18:23:56 +0000 (20:23 +0200)]
Add hr below mr title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Andrew Kumanyaev [Tue, 14 Jan 2014 18:05:12 +0000 (21:05 +0300)]
Remove Debug from tests
Andrew Kumanyaev [Tue, 14 Jan 2014 17:57:29 +0000 (20:57 +0300)]
Fix deprecation in specs
DEPRECATION: `expect { }.not_to raise_error(SpecificErrorClass)` is deprecated. Use `expect { }.not_to raise_error` (with no args) instead. Called from /home/travis/build/gitlabhq/gitlabhq/spec/tasks/gitlab/backup_rake_spec.rb:42:in `block (4 levels) in <top (required)>'.
Dmitriy Zaporozhets [Tue, 14 Jan 2014 17:56:52 +0000 (19:56 +0200)]
Dont allow merge without commit message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Tue, 14 Jan 2014 17:26:01 +0000 (18:26 +0100)]
Allow . files to be created
Fixes: https://github.com/gitlabhq/gitlabhq/issues/5770
Dmitriy Zaporozhets [Tue, 14 Jan 2014 13:56:42 +0000 (13:56 +0000)]
Merge branch 'no-options' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 14 Jan 2014 13:47:15 +0000 (13:47 +0000)]
Merge branch 'improve/side_filters' of /home/git/repositories/gitlab/gitlabhq
dosire [Tue, 14 Jan 2014 13:24:00 +0000 (14:24 +0100)]
Add note about not wanting unneeded options.
Dmitriy Zaporozhets [Tue, 14 Jan 2014 11:51:59 +0000 (13:51 +0200)]
Improve side filters and make them look similar
Dmitriy Zaporozhets [Tue, 14 Jan 2014 10:55:54 +0000 (02:55 -0800)]
Merge pull request #6038 from jvanbaarsen/fix-5767
Fix for #5767
Dmitriy Zaporozhets [Tue, 14 Jan 2014 10:48:51 +0000 (02:48 -0800)]
Merge pull request #6041 from estrai/head-panel-data-original-title-fixup
Set correct data-original-title value for my snippets
Dmitriy Zaporozhets [Tue, 14 Jan 2014 09:49:54 +0000 (11:49 +0200)]
Tests for accept MR with custom message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 14 Jan 2014 08:47:28 +0000 (10:47 +0200)]
Fix mr controller specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Daniel Lukasiak [Tue, 14 Jan 2014 08:09:20 +0000 (15:09 +0700)]
Set correct data-original-title value for my snippets
Jeroen van Baarsen [Mon, 13 Jan 2014 21:21:25 +0000 (22:21 +0100)]
Fix for #5767
In the branch graph, uploaded images where not rendered
correctly. Fixed this by not filling the rect, instead
i've put an image over it
Dmitriy Zaporozhets [Mon, 13 Jan 2014 21:18:30 +0000 (23:18 +0200)]
Use default bootstrap pills
Dmitriy Zaporozhets [Mon, 13 Jan 2014 15:54:02 +0000 (17:54 +0200)]
Add UI for custom Merge request commit message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 13 Jan 2014 15:48:13 +0000 (07:48 -0800)]
Merge pull request #6032 from sinm/patch-1
It's a bad idea to use hash symbol in a yaml value without quotes
Dmitriy Zaporozhets [Mon, 13 Jan 2014 15:21:59 +0000 (17:21 +0200)]
Use params[:merge_commit_message] in MergeRequestController for automerge
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 13 Jan 2014 15:20:30 +0000 (17:20 +0200)]
MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_message generate default one
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 13 Jan 2014 14:49:35 +0000 (16:49 +0200)]
Add merge_commit_message argument for Satellite::MergeAction#merge
Dmitriy Zaporozhets [Mon, 13 Jan 2014 14:16:45 +0000 (16:16 +0200)]
Use same code for diff and patch inside MergeAction
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 13 Jan 2014 11:17:38 +0000 (13:17 +0200)]
Add support of custom message to merge action of satellite
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 13 Jan 2014 07:47:32 +0000 (09:47 +0200)]
Imrpove new file form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
sinm [Sun, 12 Jan 2014 20:29:29 +0000 (23:29 +0300)]
It's a bad idea to use hash symbol in a yaml value without quotes
Dmitriy Zaporozhets [Sun, 12 Jan 2014 16:47:58 +0000 (18:47 +0200)]
Show selected attachment in comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 12 Jan 2014 16:32:46 +0000 (18:32 +0200)]
Small UI improvement to snippet form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 12 Jan 2014 16:10:58 +0000 (08:10 -0800)]
Merge pull request #5933 from dblessing/feature/assignee_changes_in_timeline
Add note for assignee changes
Dmitriy Zaporozhets [Sun, 12 Jan 2014 16:02:06 +0000 (08:02 -0800)]
Merge pull request #6027 from jvanbaarsen/snippet-fix
Removed expiration from snippets
Jeroen van Baarsen [Sat, 11 Jan 2014 17:40:17 +0000 (18:40 +0100)]
Dropped expiration date from the snippet API
Jeroen van Baarsen [Sat, 11 Jan 2014 17:15:47 +0000 (18:15 +0100)]
Removed expiration from snippets
* Removed the expiration from the project snippets
* Fixed the layout for the project snippets
Dmitriy Zaporozhets [Sat, 11 Jan 2014 15:10:23 +0000 (07:10 -0800)]
Merge pull request #6022 from jvanbaarsen/issue-title-in-title
Added issue title to page title
Dmitriy Zaporozhets [Sat, 11 Jan 2014 15:09:22 +0000 (07:09 -0800)]
Merge pull request #6025 from jvanbaarsen/fix-for-admin-user-edit
Fix for edit user as admin
Dmitriy Zaporozhets [Sat, 11 Jan 2014 15:03:20 +0000 (15:03 +0000)]
Merge branch 'select2' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 11 Jan 2014 14:05:41 +0000 (16:05 +0200)]
Include missing helper for project_forked_merge_requests tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Sat, 11 Jan 2014 13:54:49 +0000 (14:54 +0100)]
Fix for edit user as admin
* It fixes an issue where you where able to remove your own
admin rights. This would result in a 404 error. fixes: #2283
* It fixes an issue where you would be able to block your own
account on the edit page. This fix makes the behaviour the same
as on the admin/users overview page
Dmitriy Zaporozhets [Sat, 11 Jan 2014 13:45:29 +0000 (15:45 +0200)]
Remove include of un-existing helper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 11 Jan 2014 13:35:39 +0000 (15:35 +0200)]
Remove chosen from tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 11 Jan 2014 10:36:10 +0000 (12:36 +0200)]
Select2 dropdown autoWidth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 11 Jan 2014 10:11:54 +0000 (12:11 +0200)]
Replace chosen with select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 11 Jan 2014 10:11:32 +0000 (12:11 +0200)]
Remove chosen gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 10 Jan 2014 22:11:29 +0000 (14:11 -0800)]
Merge pull request #5735 from cocoy/fix_5313
Fix #5313 hipchat 0.14.0 to use http_proxy
Jeroen van Baarsen [Fri, 10 Jan 2014 19:31:44 +0000 (20:31 +0100)]
Added issue title to page title
* Fixes: #5966
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:51:31 +0000 (04:51 -0800)]
Merge pull request #6013 from jvanbaarsen/modal-fix
Fixed modal so it can be closed with ESC
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:49:02 +0000 (04:49 -0800)]
Merge pull request #6012 from jvanbaarsen/social_clickable
Made the skype and twitter username clickable
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:47:25 +0000 (04:47 -0800)]
Merge pull request #6002 from jhollingsworth/feature/clone-panel-twbs3
Update clone panel to use input group.
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:39:45 +0000 (14:39 +0200)]
Fix admin forms UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:14:55 +0000 (14:14 +0200)]
Refactor scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 10 Jan 2014 11:58:52 +0000 (13:58 +0200)]
Respect default theme settings. Fixed sign-in button on publica page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 10 Jan 2014 08:00:31 +0000 (08:00 +0000)]
Merge branch 'need-merge-commit' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 10 Jan 2014 07:59:08 +0000 (07:59 +0000)]
Merge branch 'contributing-expectations' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 10 Jan 2014 07:58:32 +0000 (07:58 +0000)]
Merge branch 'dates-are-absolute' of /home/git/repositories/gitlab/gitlabhq
Jeroen van Baarsen [Thu, 9 Jan 2014 16:04:46 +0000 (17:04 +0100)]
Fixed modal so it can be closed with ESC
* Fixes: #5343
Jeroen van Baarsen [Thu, 9 Jan 2014 15:33:56 +0000 (16:33 +0100)]
Made the skype and twitter username clickable
* I was not able to link the linkedin username,
since linkedin does not provide predictable URLS
* The skype url will start skype, and asks if you want to
call the particular user.
* The Twitter link will just go to the twitter profile
of the given user
dosire [Thu, 9 Jan 2014 14:58:52 +0000 (15:58 +0100)]
Ordinal numbers do not have the same ordinal.
dosire [Thu, 9 Jan 2014 14:55:57 +0000 (15:55 +0100)]
Since the 22th is fixed we can use absolute dates.
Dmitriy Zaporozhets [Thu, 9 Jan 2014 13:17:53 +0000 (05:17 -0800)]
Merge pull request #6011 from jvanbaarsen/deprecation_warning_fix
Fixed the I18n deprecation warning
Dmitriy Zaporozhets [Thu, 9 Jan 2014 13:17:10 +0000 (13:17 +0000)]
Merge branch 'refactor/search_context' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 9 Jan 2014 13:13:56 +0000 (15:13 +0200)]
Remove invalid test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 9 Jan 2014 12:23:07 +0000 (14:23 +0200)]
Better search login for global context. Improved tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Thu, 9 Jan 2014 12:17:02 +0000 (13:17 +0100)]
Fixed the I18n deprecation warning
dosire [Thu, 9 Jan 2014 11:05:24 +0000 (12:05 +0100)]
Instead of working with remotes Dmitriy suggested to use urls.
Dmitriy Zaporozhets [Thu, 9 Jan 2014 10:51:20 +0000 (12:51 +0200)]
Improve search page UX
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 9 Jan 2014 10:37:12 +0000 (12:37 +0200)]
Use new context for search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 9 Jan 2014 10:36:55 +0000 (12:36 +0200)]
Search::GlobalContext and Search::ProjectContext for separation between 2 types of search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
dosire [Thu, 9 Jan 2014 08:30:01 +0000 (09:30 +0100)]
Ask people to link bakc and be prepared for feedback.
Dmitriy Zaporozhets [Thu, 9 Jan 2014 08:29:55 +0000 (10:29 +0200)]
Fix public project search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 9 Jan 2014 08:24:46 +0000 (00:24 -0800)]
Merge pull request #5427 from karlhungus/feature_search_code_in_public_repos
Allow public repo searching
Dmitriy Zaporozhets [Thu, 9 Jan 2014 08:12:17 +0000 (10:12 +0200)]
Fix tree table overflow
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>