OSDN Git Service
Dmitriy Zaporozhets [Tue, 12 Mar 2013 11:31:57 +0000 (04:31 -0700)]
Merge pull request #3196 from Undev/feature/broken-projects-search-23049
Broken projects search on dashboard
Andrew8xx8 [Tue, 12 Mar 2013 11:15:14 +0000 (15:15 +0400)]
Tests for dashboard projects fixed
Dmitriy Zaporozhets [Tue, 12 Mar 2013 10:53:07 +0000 (12:53 +0200)]
check gitlab-shell version in gitlab:check
Dmitriy Zaporozhets [Tue, 12 Mar 2013 10:40:49 +0000 (12:40 +0200)]
fix project move email
Dmitriy Zaporozhets [Tue, 12 Mar 2013 10:37:53 +0000 (12:37 +0200)]
Use gitlab-shell to move repos. Requires gitlab-shell v1.1.0
Andrew8xx8 [Tue, 12 Mar 2013 09:40:54 +0000 (13:40 +0400)]
Tests improved
Andrew8xx8 [Tue, 12 Mar 2013 09:33:27 +0000 (13:33 +0400)]
Search fields were have same id's. Fixed
Andrew8xx8 [Tue, 12 Mar 2013 09:26:45 +0000 (13:26 +0400)]
Search projects on dashboard was not worked. Fixed
Dmitriy Zaporozhets [Tue, 12 Mar 2013 08:46:04 +0000 (10:46 +0200)]
restyle and cleanup emails
Dmitriy Zaporozhets [Mon, 11 Mar 2013 13:48:16 +0000 (06:48 -0700)]
Merge pull request #3192 from hiroponz/convert-to-coffee
Convert branch-graph.js to branch-graph.js.coffee
Dmitriy Zaporozhets [Mon, 11 Mar 2013 13:47:44 +0000 (15:47 +0200)]
fix api internal test
Sato Hiroyuki [Mon, 11 Mar 2013 08:52:27 +0000 (17:52 +0900)]
Covert to coffee.
Dmitriy Zaporozhets [Mon, 11 Mar 2013 12:35:00 +0000 (14:35 +0200)]
Reduce amount of user info provided with internal api
Sato Hiroyuki [Mon, 11 Mar 2013 07:40:58 +0000 (16:40 +0900)]
Rename to coffee.
Dmitriy Zaporozhets [Mon, 11 Mar 2013 06:56:29 +0000 (23:56 -0700)]
Merge pull request #3170 from Asquera/api/system_hooks_adjustments
API: system hook request functions and documentation updated
Dmitriy Zaporozhets [Sun, 10 Mar 2013 18:29:34 +0000 (20:29 +0200)]
fixed travis env, added coverage badge
Dmitriy Zaporozhets [Sun, 10 Mar 2013 18:26:27 +0000 (20:26 +0200)]
add coveralls.io to travis builds
Dmitriy Zaporozhets [Sun, 10 Mar 2013 10:16:57 +0000 (12:16 +0200)]
Group and team rss is valid now
Dmitriy Zaporozhets [Sun, 10 Mar 2013 09:57:14 +0000 (11:57 +0200)]
Move groups and teams to tabs on dashboard. Remember tab with cookie
Dmitriy Zaporozhets [Sun, 10 Mar 2013 09:00:14 +0000 (01:00 -0800)]
Merge pull request #3169 from hiroponz/refactor-network-graph
Refactor network graph
Dmitriy Zaporozhets [Sat, 9 Mar 2013 22:12:25 +0000 (00:12 +0200)]
better logo images for header
Dmitriy Zaporozhets [Fri, 8 Mar 2013 11:14:47 +0000 (13:14 +0200)]
fix event relative date being cached
Dmitriy Zaporozhets [Fri, 8 Mar 2013 10:08:09 +0000 (02:08 -0800)]
Merge pull request #3173 from m4tthumphrey/patch-1
Added system hooks link to doc index
Matt Humphrey [Fri, 8 Mar 2013 09:37:00 +0000 (09:37 +0000)]
Added system hooks link to doc index
Sebastian Ziebell [Thu, 7 Mar 2013 16:59:27 +0000 (17:59 +0100)]
Merge branch 'master' into api/system_hooks_adjustments
Sebastian Ziebell [Thu, 7 Mar 2013 16:56:11 +0000 (17:56 +0100)]
API: system hooks API functions and documentation updated
* updated system hooks documentation and code comments
* fixed access to system hooks if no user given resulting in a `500 Server Error`
* added tests
Dmitriy Zaporozhets [Thu, 7 Mar 2013 16:33:34 +0000 (08:33 -0800)]
Merge pull request #2835 from Asquera/fixes/api
Fix API return codes
Sebastian Ziebell [Thu, 7 Mar 2013 14:11:33 +0000 (15:11 +0100)]
API: fixes project creation and removed redundant info
Sebastian Ziebell [Thu, 7 Mar 2013 13:51:56 +0000 (14:51 +0100)]
Merge branch 'master' into fixes/api, code clean up and tests fixed
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
Dmitriy Zaporozhets [Thu, 7 Mar 2013 12:18:30 +0000 (14:18 +0200)]
block user should not be able to push
Sato Hiroyuki [Thu, 7 Mar 2013 11:47:04 +0000 (20:47 +0900)]
Refactor: Removing a if statement, because the nil value is already removed in the view template.
Sato Hiroyuki [Thu, 7 Mar 2013 11:36:40 +0000 (20:36 +0900)]
Refactor: Removing the duplicated code.
Sato Hiroyuki [Thu, 7 Mar 2013 10:52:46 +0000 (19:52 +0900)]
Refactor: change the map hash from a local variable to private variable.
Sato Hiroyuki [Thu, 7 Mar 2013 10:16:51 +0000 (19:16 +0900)]
Refacor: removing the times array, because that is same with @commits array.
Dmitriy Zaporozhets [Thu, 7 Mar 2013 10:08:11 +0000 (02:08 -0800)]
Merge pull request #3047 from mikew/capistrano-deploy-example
Capistrano deploy example
Dmitriy Zaporozhets [Thu, 7 Mar 2013 09:55:19 +0000 (01:55 -0800)]
Merge pull request #3139 from rapofran/auto_focus_ldap_login
Autofocus to username input (LDAP login).
Dmitriy Zaporozhets [Thu, 7 Mar 2013 09:45:44 +0000 (11:45 +0200)]
fix stubbed repo
Dmitriy Zaporozhets [Thu, 7 Mar 2013 09:14:19 +0000 (11:14 +0200)]
remove last commit widget, added repo size and owner info on project home page
Sato Hiroyuki [Thu, 7 Mar 2013 08:56:01 +0000 (17:56 +0900)]
Refactor: clean up models.
* Network::Commit
** Removing unnecessary accessors.
** Removing add_refs methods.
* Network::Graph
** Removing unnecessary accessors.
** The 3 times loop of commits don't need.
Dmitriy Zaporozhets [Thu, 7 Mar 2013 08:08:43 +0000 (10:08 +0200)]
show project description on public area
Dmitriy Zaporozhets [Thu, 7 Mar 2013 06:57:24 +0000 (22:57 -0800)]
Merge pull request #3146 from amacarthur/AdminAPIs
Additional Admin APIs
Dmitriy Zaporozhets [Thu, 7 Mar 2013 06:43:13 +0000 (22:43 -0800)]
Merge pull request #3159 from peikk0/allow-redis-via-socket
Allow connection to Redis via unix socket
Sato Hiroyuki [Thu, 7 Mar 2013 06:42:30 +0000 (15:42 +0900)]
Refactor: rename module and class names.
* Module: Graph -> Network
* Class: JsonBuilder -> Graph
Dmitriy Zaporozhets [Thu, 7 Mar 2013 06:31:25 +0000 (22:31 -0800)]
Merge pull request #3161 from cabello/patch-1
Refactor README to split production/development environments
Sato Hiroyuki [Wed, 6 Mar 2013 12:01:40 +0000 (21:01 +0900)]
Refactor: grouping parent and their space by including array.
Sato Hiroyuki [Wed, 6 Mar 2013 11:31:28 +0000 (20:31 +0900)]
Refactor: replace "render :json = graph.to_json" to view template(show.json.erb).
Because model shouldn't know about view logic.
Danilo Cabello [Thu, 7 Mar 2013 01:06:56 +0000 (20:06 -0500)]
Refactor README to split production/development environments
Sebastian Ziebell [Wed, 6 Mar 2013 23:15:57 +0000 (00:15 +0100)]
API: documentation contains infos to status codes in README file.
All the info to return codes from the API functions are available in the `README.md` file as suggested.
Pierre GUINOISEAU [Wed, 6 Mar 2013 21:06:12 +0000 (22:06 +0100)]
Allow connection to Redis via unix socket
Allow connection to Redis via unix socket, using
unix:/var/run/redis/redis.sock for example.
Default behaviour does not change, except that the full Redis URL must
be configured, with redis:// for tcp or unix: for unix socket.
Dmitriy Zaporozhets [Wed, 6 Mar 2013 20:56:48 +0000 (22:56 +0200)]
Return project description back
Dmitriy Zaporozhets [Wed, 6 Mar 2013 19:48:15 +0000 (21:48 +0200)]
show highlighted code correctly inside issue body
Dmitriy Zaporozhets [Wed, 6 Mar 2013 19:39:10 +0000 (21:39 +0200)]
fix js syntax error
Dmitriy Zaporozhets [Wed, 6 Mar 2013 19:12:47 +0000 (21:12 +0200)]
add system hooks api docs to help content
Dmitriy Zaporozhets [Wed, 6 Mar 2013 19:10:01 +0000 (21:10 +0200)]
update Gemfile.lock with https rubygems
Dmitriy Zaporozhets [Wed, 6 Mar 2013 18:22:45 +0000 (10:22 -0800)]
Merge pull request #3158 from dosire/master
Use secure protocol
Sytse Sijbrandij [Wed, 6 Mar 2013 16:55:11 +0000 (17:55 +0100)]
Use secure protocol
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:43:45 +0000 (07:43 -0800)]
Merge pull request #3149 from m4tthumphrey/api-deploy-keys
Added methods to manage project deploy keys via API
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:42:43 +0000 (07:42 -0800)]
Merge pull request #3156 from m4tthumphrey/api-system-hooks
Added methods to manage system hooks from API
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:37:07 +0000 (07:37 -0800)]
Merge pull request #3157 from cabello/patch-1
Update README with references to versions.
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:30:48 +0000 (17:30 +0200)]
Use redis as cache storage. cache events
Danilo Cabello [Wed, 6 Mar 2013 15:20:46 +0000 (10:20 -0500)]
Update README with references to versions.
Matt Humphrey [Wed, 6 Mar 2013 10:33:32 +0000 (10:33 +0000)]
System hooks API.
Dmitriy Zaporozhets [Wed, 6 Mar 2013 15:12:28 +0000 (17:12 +0200)]
Fix loading animation while browsing tree
Dmitriy Zaporozhets [Wed, 6 Mar 2013 13:08:09 +0000 (05:08 -0800)]
Merge pull request #3154 from hiroponz/fix-routing-error
Fix routing error
Sato Hiroyuki [Wed, 6 Mar 2013 06:17:01 +0000 (15:17 +0900)]
Adding sleep statements to allow sufficient time for the page to settle.
Sato Hiroyuki [Wed, 6 Mar 2013 04:53:30 +0000 (13:53 +0900)]
Don't set format manually, bacause set in routing.
Sato Hiroyuki [Wed, 6 Mar 2013 04:42:45 +0000 (13:42 +0900)]
Fix routing errors.
It should fix #2598.
Sato Hiroyuki [Wed, 6 Mar 2013 03:59:28 +0000 (12:59 +0900)]
Add and fix some tests for routing.
It is linked to #2598.
Dmitriy Zaporozhets [Wed, 6 Mar 2013 07:12:14 +0000 (09:12 +0200)]
fix public projects identations
Angus MacArthur [Wed, 6 Mar 2013 04:48:40 +0000 (23:48 -0500)]
Updated documentation for added Admin APIs
Sebastian Ziebell [Tue, 5 Mar 2013 22:43:05 +0000 (23:43 +0100)]
API: refactored and simplified error handling in merge requests API
Sebastian Ziebell [Tue, 5 Mar 2013 21:33:45 +0000 (22:33 +0100)]
Fixes api
Sebastian Ziebell [Tue, 5 Mar 2013 21:29:49 +0000 (22:29 +0100)]
Merge branch 'master' into fixes/api
Conflicts:
lib/api/projects.rb
Matt Humphrey [Tue, 5 Mar 2013 21:23:29 +0000 (21:23 +0000)]
Project deploy keys API
Angus MacArthur [Wed, 14 Nov 2012 20:37:52 +0000 (15:37 -0500)]
Additional Admin APIs
Dmitriy Zaporozhets [Tue, 5 Mar 2013 15:28:13 +0000 (17:28 +0200)]
reduce letter-spacing for top nav
Dmitriy Zaporozhets [Tue, 5 Mar 2013 15:15:20 +0000 (17:15 +0200)]
tree_heleper: concat html only if present. Avoid nil exception
Dmitriy Zaporozhets [Tue, 5 Mar 2013 15:06:22 +0000 (17:06 +0200)]
better solution for #3027
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:54:31 +0000 (06:54 -0800)]
Merge pull request #2870 from mikew/relative-url-root-default
default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT']
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:52:41 +0000 (06:52 -0800)]
Merge pull request #3106 from davidosomething/patch-1
Update doc/install/databases.md
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:50:46 +0000 (16:50 +0200)]
Merge branch 'gliptak-omniauth_no_email_1'
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:50:37 +0000 (16:50 +0200)]
fixed omniauth email spec
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:48:18 +0000 (16:48 +0200)]
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1
Conflicts:
app/observers/user_observer.rb
spec/observers/user_observer_spec.rb
Dmitriy Zaporozhets [Tue, 5 Mar 2013 14:40:13 +0000 (06:40 -0800)]
Merge pull request #2015 from elvanja/commits-group-and-sort-by-date-desc
fix: grouping commits by date desc doesn't sort the groups too
Dmitriy Zaporozhets [Tue, 5 Mar 2013 13:52:01 +0000 (05:52 -0800)]
Merge pull request #2954 from cabeca/fix-image-url-emoji
Fix image url for emoji.
Dmitriy Zaporozhets [Tue, 5 Mar 2013 13:38:16 +0000 (05:38 -0800)]
Merge pull request #3143 from Undev/state-machine-3
State machine 3
Dmitriy Zaporozhets [Tue, 5 Mar 2013 11:16:56 +0000 (13:16 +0200)]
remove custom font
Andrew8xx8 [Tue, 5 Mar 2013 10:29:44 +0000 (14:29 +0400)]
Typo fixed
Dmitriy Zaporozhets [Tue, 5 Mar 2013 07:27:06 +0000 (09:27 +0200)]
Prevent app crash if team owner removed
Dmitriy Zaporozhets [Tue, 5 Mar 2013 07:02:27 +0000 (23:02 -0800)]
Merge pull request #3109 from hiroponz/improve-network-graph
Improve network graph
J. Francisco Raposerias [Mon, 4 Mar 2013 20:54:26 +0000 (17:54 -0300)]
add autofocus to username input
Dmitriy Zaporozhets [Mon, 4 Mar 2013 20:18:53 +0000 (22:18 +0200)]
Make clone widget read-only
Dmitriy Zaporozhets [Mon, 4 Mar 2013 20:00:51 +0000 (22:00 +0200)]
better event-notes typography
Dmitriy Zaporozhets [Mon, 4 Mar 2013 19:34:26 +0000 (21:34 +0200)]
use md-typography for note content
Dmitriy Zaporozhets [Mon, 4 Mar 2013 19:12:36 +0000 (21:12 +0200)]
= preserve do was ignored for empty project page so was replaced with filter
Dmitriy Zaporozhets [Mon, 4 Mar 2013 19:11:03 +0000 (21:11 +0200)]
Fix dark color bg for wiki
Dmitriy Zaporozhets [Mon, 4 Mar 2013 18:11:23 +0000 (20:11 +0200)]
add link ti public area
Dmitriy Zaporozhets [Mon, 4 Mar 2013 17:47:20 +0000 (19:47 +0200)]
Fix edit team page
Andrew8xx8 [Mon, 4 Mar 2013 14:52:30 +0000 (18:52 +0400)]
User's blocked field refactored to use state machine
Andrew8xx8 [Mon, 4 Mar 2013 14:51:00 +0000 (18:51 +0400)]
Migrations added