OSDN Git Service
Thomas Guyot-Sionnest [Wed, 4 Dec 2013 23:07:14 +0000 (18:07 -0500)]
Fix HTTP push to public repos
When doing an HTTP push, git (as of v1.7.9) first do an info/refs
request, and only if this request requires authentication it asks the
user for its password and authenticates further requests.
The initial request normally clears without auth on public repos as it
doesn't update any ref. This patch forces every git-receive-pack
requests to provide authentication.
Dmitriy Zaporozhets [Wed, 4 Dec 2013 14:56:19 +0000 (14:56 +0000)]
Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 4 Dec 2013 13:42:06 +0000 (13:42 +0000)]
Merge branch 'feature/event_hooks' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:56:12 +0000 (13:56 +0200)]
Update devise to latest version of 2.2.x
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:35:38 +0000 (13:35 +0200)]
ProjectHook API supports new event fields
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:20:16 +0000 (13:20 +0200)]
Extract tests for project hooks API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:19:53 +0000 (13:19 +0200)]
Expose ProjectHook attributes via API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 11:02:16 +0000 (13:02 +0200)]
Mention advanced project hooks in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 19:59:06 +0000 (21:59 +0200)]
Improve help page for Project web hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 17:25:16 +0000 (19:25 +0200)]
Update WebHook help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 17:11:10 +0000 (19:11 +0200)]
Annotate web_hooks table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 10:08:00 +0000 (12:08 +0200)]
Modify test to pass new project hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 09:34:06 +0000 (11:34 +0200)]
Execute project hooks when issue or merge request created
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 09:31:56 +0000 (11:31 +0200)]
Prepare ProjectHooks to work with issues and merge_requests
* Add event scopes to ProjectHook
* Added Issuable#to_hook_data
* Project#execute_hooks now accept hook filter as argument
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 19:38:32 +0000 (21:38 +0200)]
UI with event types for Project WebHooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 19:33:43 +0000 (21:33 +0200)]
Add new fields to web_hooks table.
Next fields were added:
* push_events
* issues_events
* merge_requests_events
Main goal is to create web hooks that can be triggered only for certain
event types. For example you can have separate web hook for push events
and another one for issues.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 4 Dec 2013 10:51:14 +0000 (02:51 -0800)]
Merge pull request #5741 from archiloque/unused_http_url
Unused http_url member in project & gollum_wiki
Dmitriy Zaporozhets [Wed, 4 Dec 2013 10:48:57 +0000 (02:48 -0800)]
Merge pull request #5755 from PlugIN73/patch-1
Fix bug with showing create merge request button
Alexander Vagin [Wed, 4 Dec 2013 08:02:36 +0000 (11:02 +0300)]
Fix bug with showing create merge request button while merge request are disabled in project settings
Dmitriy Zaporozhets [Wed, 4 Dec 2013 07:13:09 +0000 (09:13 +0200)]
Update rails to 3.2.16
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Tue, 3 Dec 2013 17:51:21 +0000 (18:51 +0100)]
Limit the number of results in gitlab:ldap:check
Dmitriy Zaporozhets [Tue, 3 Dec 2013 13:38:55 +0000 (15:38 +0200)]
Modify logo a bit
Dmitriy Zaporozhets [Tue, 3 Dec 2013 10:19:48 +0000 (12:19 +0200)]
Improve UI for stacked nav-pills
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Tue, 3 Dec 2013 07:52:04 +0000 (23:52 -0800)]
Merge pull request #5733 from bke-drewb/issue-5716
Issue 5716 - Allow removal of avatar
Jacob Vosmaer [Tue, 3 Dec 2013 07:29:11 +0000 (23:29 -0800)]
Merge pull request #5610 from demosdemon/patch-1
Add client_max_body_size to nginx site
Drew Blessing [Mon, 2 Dec 2013 18:03:07 +0000 (12:03 -0600)]
Issue 5716 - Allow removal of avatar
Add class and style
Add spinach tests
Add entry to CHANGELOG
Add entry to CHANGELOG
Dmitriy Zaporozhets [Mon, 2 Dec 2013 15:24:03 +0000 (17:24 +0200)]
Small UI fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 13:22:38 +0000 (15:22 +0200)]
Fix broken pagination for issues
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 13:08:43 +0000 (15:08 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 2 Dec 2013 12:38:56 +0000 (04:38 -0800)]
Merge pull request #5732 from Tandrial/patch-1
Missing gem bundler
Dmitriy Zaporozhets [Mon, 2 Dec 2013 12:33:27 +0000 (14:33 +0200)]
remove GET window.updatePage method that do dataType script
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 12:32:54 +0000 (14:32 +0200)]
Remove GET .js format for Milestone controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 12:27:36 +0000 (14:27 +0200)]
Remove .js format for MergeRequest controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Julien Kirch [Mon, 2 Dec 2013 10:13:53 +0000 (11:13 +0100)]
Unused http_url member in project & gollum_wiki
Dmitriy Zaporozhets [Mon, 2 Dec 2013 08:39:46 +0000 (10:39 +0200)]
Disable travis notifications
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 2 Dec 2013 07:46:37 +0000 (09:46 +0200)]
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 2 Dec 2013 07:46:26 +0000 (07:46 +0000)]
Merge branch 'add-cookbook' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 2 Dec 2013 07:45:50 +0000 (07:45 +0000)]
Merge branch 'make-gender-neutral' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 2 Dec 2013 07:34:26 +0000 (09:34 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 2 Dec 2013 07:33:48 +0000 (23:33 -0800)]
Merge pull request #5724 from Popl7/add_thumbsup_thumbsdown_emoji_voting
Thumbsup and thumbsdown emoji should be counted when voting
Dmitriy Zaporozhets [Mon, 2 Dec 2013 07:33:21 +0000 (23:33 -0800)]
Merge pull request #5725 from Popl7/http_repo_link_on_public_acces
Correct url to pull puplic repos anonymously on project page
Dmitriy Zaporozhets [Mon, 2 Dec 2013 07:30:38 +0000 (23:30 -0800)]
Merge pull request #5731 from bke-drewb/helpui
Improve Help navigation UI
Sytse Sijbrandij [Sun, 1 Dec 2013 11:10:16 +0000 (03:10 -0800)]
Merge pull request #5737 from Popl7/type_fix_for_project_network_graph
type_fix_for_project_network_graph
Sytse Sijbrandij [Sun, 1 Dec 2013 10:53:00 +0000 (11:53 +0100)]
We welcome everyone to contribute.
Steven Thonus [Sat, 30 Nov 2013 16:25:04 +0000 (17:25 +0100)]
type_fix_for_project_network_graph
Sytse Sijbrandij [Sat, 30 Nov 2013 11:39:11 +0000 (12:39 +0100)]
Comprehensive list of installation methods.
Dmitriy Zaporozhets [Sat, 30 Nov 2013 08:07:36 +0000 (08:07 +0000)]
Merge branch 'relative-url-needs-warning' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 30 Nov 2013 08:06:51 +0000 (08:06 +0000)]
Merge branch 'database_doc' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 30 Nov 2013 08:05:08 +0000 (08:05 +0000)]
Merge branch 'line-for-side-by-side-diff' of /home/git/repositories/gitlab/gitlabhq
Tandrial [Fri, 29 Nov 2013 20:43:40 +0000 (21:43 +0100)]
Update ruby.md
Trying to install the gem bundle without bundler fails with:
/usr/local/lib/ruby/2.0.0/rubygems/dependency.rb:296:in `to_specs': Could not find 'bundler' (>= 0) among 8 total gem(s) (Gem::LoadError)
from /usr/local/lib/ruby/2.0.0/rubygems/dependency.rb:307:in `to_spec'
from /usr/local/lib/ruby/2.0.0/rubygems/core_ext/kernel_gem.rb:47:in `gem'
from /usr/local/bin/bundle:22:in `<main>'
Installing the bundler (with sudo gem install bundler) at the end of Step 4 fixes this.
Drew Blessing [Fri, 29 Nov 2013 19:38:23 +0000 (13:38 -0600)]
Improve Help navigation UI
Make hash keys symbols
Marin Jankovski [Fri, 29 Nov 2013 15:46:38 +0000 (16:46 +0100)]
Change the mysql user to git from gitlab.
Dmitriy Zaporozhets [Fri, 29 Nov 2013 14:21:26 +0000 (14:21 +0000)]
Merge branch 'drop_rjs_2' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 29 Nov 2013 13:38:41 +0000 (13:38 +0000)]
Merge branch 'feature/repo_size_in_admin' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Fri, 29 Nov 2013 13:23:48 +0000 (14:23 +0100)]
Side-by-side in changelog.
Dmitriy Zaporozhets [Fri, 29 Nov 2013 13:10:52 +0000 (13:10 +0000)]
Merge branch 'feature/readme_link' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 29 Nov 2013 13:05:32 +0000 (15:05 +0200)]
Drop rjs from Issues#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 29 Nov 2013 12:46:40 +0000 (14:46 +0200)]
Drop rjs from Notes#index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 29 Nov 2013 12:16:17 +0000 (14:16 +0200)]
Show bare repository size in admin area(projects page)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 29 Nov 2013 11:52:10 +0000 (13:52 +0200)]
README link from project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 29 Nov 2013 11:31:57 +0000 (13:31 +0200)]
Fix app theme being ignored for public projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Steven Thonus [Thu, 28 Nov 2013 21:46:55 +0000 (22:46 +0100)]
showing as default http link for public repo when anonymous
Dmitriy Zaporozhets [Fri, 29 Nov 2013 08:18:34 +0000 (00:18 -0800)]
Merge pull request #5708 from jhollingsworth/feature/multiline-blob-select
Enable multiline select for blobs.
Dmitriy Zaporozhets [Fri, 29 Nov 2013 08:06:48 +0000 (00:06 -0800)]
Merge pull request #5726 from hbristow/retina_favicon
Updated favicon.ico to include retina assets and migrated from GL to cat glyph
Sytse Sijbrandij [Fri, 29 Nov 2013 07:57:45 +0000 (08:57 +0100)]
Add warning back.
Hilton Bristow [Thu, 28 Nov 2013 23:53:14 +0000 (09:53 +1000)]
Updated favicon.ico to include retina assets and migrated from GL to cat glyph
vagrant [Thu, 28 Nov 2013 20:05:37 +0000 (20:05 +0000)]
added thumbsup and thumsdown emoji voting with rspec tests
Dmitriy Zaporozhets [Thu, 28 Nov 2013 17:26:21 +0000 (19:26 +0200)]
Merge remote-tracking branch 'origin/side-by-side'
Conflicts:
CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 28 Nov 2013 17:24:54 +0000 (17:24 +0000)]
Merge branch 'wiki-reference' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 28 Nov 2013 17:24:36 +0000 (17:24 +0000)]
Merge branch 'auto_disable_color' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 28 Nov 2013 17:23:54 +0000 (17:23 +0000)]
Merge branch 'unofficial-is-unclear' of /home/git/repositories/gitlab/gitlabhq
Jacob Vosmaer [Thu, 28 Nov 2013 17:12:30 +0000 (18:12 +0100)]
Give more information in rake gitlab:ldap:check
Jacob Vosmaer [Thu, 28 Nov 2013 17:12:12 +0000 (18:12 +0100)]
Refer to rake gitlab:ldap:check script
Jacob Vosmaer [Thu, 28 Nov 2013 14:20:40 +0000 (15:20 +0100)]
Add LDAP check to rake gitlab:check
Dmitriy Zaporozhets [Thu, 28 Nov 2013 10:30:24 +0000 (10:30 +0000)]
Merge branch 'drop_rjs' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 28 Nov 2013 09:38:20 +0000 (11:38 +0200)]
Drop rjs from Infinite scrolling
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 28 Nov 2013 08:36:13 +0000 (10:36 +0200)]
Add internal projects to CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Thu, 28 Nov 2013 06:57:56 +0000 (07:57 +0100)]
Unsupported is unclear.
Jason Hollingsworth [Wed, 27 Nov 2013 18:24:27 +0000 (12:24 -0600)]
Enable multiline select for blobs.
Holding shift will allow users to click and select multiple lines.
The behavior is similar to GitHub.
Complete with tests.
Sytse Sijbrandij [Wed, 27 Nov 2013 16:57:55 +0000 (17:57 +0100)]
Button name has an upcase in it.
Sytse Sijbrandij [Wed, 27 Nov 2013 16:26:04 +0000 (17:26 +0100)]
Wiki page url changed due to title cleanup.
Dmitriy Zaporozhets [Wed, 27 Nov 2013 14:01:36 +0000 (14:01 +0000)]
Merge branch 'improve/show_issue_state' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 27 Nov 2013 13:00:57 +0000 (15:00 +0200)]
Capybara tests with first-child/last-child randomly fails so replaced with alternative method
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 12:20:49 +0000 (04:20 -0800)]
Merge pull request #5701 from gitlabhq/feature/internal_projects
Feature: Internal projects
Dmitriy Zaporozhets [Wed, 27 Nov 2013 11:40:32 +0000 (13:40 +0200)]
Remove unnecessary \" symbols
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 11:26:16 +0000 (13:26 +0200)]
Restyle public access help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 11:13:33 +0000 (13:13 +0200)]
Improve UX of project visiblity level. Improve "Public Access" help page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 10:22:19 +0000 (10:22 +0000)]
Show issue open state as label
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:51:46 +0000 (11:51 +0200)]
Merge branch 'authenticated_public_mode' of https://github.com/jhollingsworth/gitlabhq into feature/internal_projects
Conflicts:
app/models/project.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:31:50 +0000 (09:31 +0000)]
Merge branch 'improve/preview_button' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:31:41 +0000 (09:31 +0000)]
Merge branch 'bug/default_branch_cached' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:31:29 +0000 (09:31 +0000)]
Merge branch 'feature/readonly_ldap_email' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:29:52 +0000 (11:29 +0200)]
Minor UI improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:18:33 +0000 (11:18 +0200)]
Rollback preview button href
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 09:14:42 +0000 (11:14 +0200)]
Improve preview/edit links for comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jacob Vosmaer [Wed, 27 Nov 2013 09:07:26 +0000 (10:07 +0100)]
Disable rake color output unless connected to TTY
Dmitriy Zaporozhets [Wed, 27 Nov 2013 08:49:59 +0000 (10:49 +0200)]
Fix default branch being cached and show old one after change
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 08:32:37 +0000 (10:32 +0200)]
Read-only email field for LDAP user
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 27 Nov 2013 08:04:00 +0000 (10:04 +0200)]
Use 1.9 hash syntax for some tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Wed, 27 Nov 2013 08:00:14 +0000 (09:00 +0100)]
Conventional naming for diff modes.
OSDN Git Service
