OSDN Git Service
Dmitriy Zaporozhets [Fri, 1 Feb 2013 07:33:12 +0000 (09:33 +0200)]
fix app crash if author is missing
Dmitriy Zaporozhets [Fri, 1 Feb 2013 06:59:30 +0000 (08:59 +0200)]
Fix sending commit note email to id instead email
Dmitriy Zaporozhets [Thu, 31 Jan 2013 18:44:20 +0000 (10:44 -0800)]
Merge pull request #2839 from m4tthumphrey/protected-branches-api
Added methods to protect and unprotect branches in from the API
Dmitriy Zaporozhets [Thu, 31 Jan 2013 11:13:17 +0000 (13:13 +0200)]
fix notes specs
Dmitriy Zaporozhets [Thu, 31 Jan 2013 11:00:50 +0000 (13:00 +0200)]
Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api
Conflicts:
spec/requests/api/users_spec.rb
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:54:48 +0000 (02:54 -0800)]
Merge pull request #2711 from fbehrens/patch-1
Update config/database.yml.postgresql
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:33:59 +0000 (02:33 -0800)]
Merge pull request #2855 from hiroponz/fix-bug-of-network-graph
Fix bug of network graph(#2847) and trivial code clean up.
Dmitriy Zaporozhets [Thu, 31 Jan 2013 10:08:56 +0000 (12:08 +0200)]
fix active tabs tests
Matt Humphrey [Mon, 28 Jan 2013 17:22:44 +0000 (17:22 +0000)]
Added methods to protect and unprotect branches
Dmitriy Zaporozhets [Thu, 31 Jan 2013 09:22:06 +0000 (11:22 +0200)]
a bit of restyling. Replace some images with icons. Simplify note form
Sato Hiroyuki [Thu, 31 Jan 2013 08:29:36 +0000 (17:29 +0900)]
Fix bug of network graph(#2847) and trivial code clean up.
Dmitriy Zaporozhets [Thu, 31 Jan 2013 08:08:20 +0000 (10:08 +0200)]
fix routing specs
Dmitriy Zaporozhets [Thu, 31 Jan 2013 07:11:35 +0000 (09:11 +0200)]
add path and path_with_namespace to api project entity
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:55:31 +0000 (08:55 +0200)]
fix pagination issue
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:46:59 +0000 (08:46 +0200)]
missing doc for api
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:42:11 +0000 (08:42 +0200)]
add specs for api -> merge request notes
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:25:02 +0000 (22:25 -0800)]
Merge pull request #2842 from inome/ExposeMergeRequestAsNotable
Expose MergeRequest object as a notable in the API to allow for easy ret...
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:23:33 +0000 (22:23 -0800)]
Merge pull request #2852 from hiroponz/displaying-commit-on-new-window
Displaying commit on a new window, when clicking commit on network graph.
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:22:37 +0000 (22:22 -0800)]
Merge pull request #2847 from hiroponz/improve-overlap-lines
Improve overlap of lines in network graph
Dmitriy Zaporozhets [Thu, 31 Jan 2013 06:21:19 +0000 (22:21 -0800)]
Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph
Switchable the main branch on network graph
Sato Hiroyuki [Thu, 31 Jan 2013 04:22:08 +0000 (13:22 +0900)]
Fix wrong path of features.
Sato Hiroyuki [Thu, 31 Jan 2013 01:37:23 +0000 (10:37 +0900)]
Displaying commit on a new window, when clicking commit on network graph.
Dmitriy Zaporozhets [Wed, 30 Jan 2013 17:28:48 +0000 (17:28 +0000)]
Merge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 30 Jan 2013 15:13:05 +0000 (17:13 +0200)]
Few usability improvments
Dmitriy Zaporozhets [Wed, 30 Jan 2013 15:07:44 +0000 (17:07 +0200)]
Fixed link_to_member
Dmitriy Zaporozhets [Wed, 30 Jan 2013 15:01:58 +0000 (17:01 +0200)]
a bit of split up for gitlab-bootstrap
Dmitriy Zaporozhets [Wed, 30 Jan 2013 14:53:18 +0000 (16:53 +0200)]
remove old alert messages
Sato Hiroyuki [Wed, 30 Jan 2013 13:20:00 +0000 (22:20 +0900)]
Improve overlap of lines in network graph
Dmitriy Zaporozhets [Wed, 30 Jan 2013 14:40:43 +0000 (16:40 +0200)]
replace right with pull-right
Dmitriy Zaporozhets [Wed, 30 Jan 2013 14:32:02 +0000 (06:32 -0800)]
Merge pull request #2837 from xudiera/master
Fixed a grammar mistake in alert-message.block-message
Micah Huff [Wed, 30 Jan 2013 05:15:13 +0000 (21:15 -0800)]
Expose MergeRequest object as a notable in the API to allow for easy retrieval of comments
Sato Hiroyuki [Tue, 29 Jan 2013 08:25:17 +0000 (17:25 +0900)]
Switchable the main branch on network graph
Dmitriy Zaporozhets [Tue, 29 Jan 2013 20:57:15 +0000 (22:57 +0200)]
few styling for buttons
Dmitriy Zaporozhets [Tue, 29 Jan 2013 20:29:21 +0000 (22:29 +0200)]
refactor buttons pt2
Dmitriy Zaporozhets [Tue, 29 Jan 2013 20:18:19 +0000 (22:18 +0200)]
refactor buttons pt1
Carlos Xudiera [Tue, 29 Jan 2013 17:58:34 +0000 (12:58 -0500)]
Fixed a grammar mistake in alert-message.block-message
Dmitriy Zaporozhets [Tue, 29 Jan 2013 12:49:10 +0000 (14:49 +0200)]
set link to gitlab-ci
Dmitriy Zaporozhets [Tue, 29 Jan 2013 10:12:24 +0000 (12:12 +0200)]
satellites logs
Dmitriy Zaporozhets [Tue, 29 Jan 2013 09:32:05 +0000 (11:32 +0200)]
Advanced logging for post-receive worker
Dmitriy Zaporozhets [Tue, 29 Jan 2013 09:00:56 +0000 (11:00 +0200)]
dont escape images inside links for gfm. Fixes #2701
Dmitriy Zaporozhets [Mon, 28 Jan 2013 21:03:38 +0000 (23:03 +0200)]
fix key observer tests
Dmitriy Zaporozhets [Mon, 28 Jan 2013 19:02:10 +0000 (21:02 +0200)]
keys to gitolite via sidekiq now
Dmitriy Zaporozhets [Mon, 28 Jan 2013 18:33:59 +0000 (10:33 -0800)]
Merge pull request #2801 from Takuto88/master
Fix #2790
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:54:31 +0000 (15:54 +0000)]
Merge branch 'features/async_gitolite' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:53:01 +0000 (17:53 +0200)]
fix tests
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:46:24 +0000 (17:46 +0200)]
user factory username over sequence
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:39:02 +0000 (17:39 +0200)]
Async perform for add/remove team members
Dmitriy Zaporozhets [Mon, 28 Jan 2013 15:22:45 +0000 (17:22 +0200)]
Do gitolite calls async. Remove satellite with project remove
Lennart Rosam [Mon, 28 Jan 2013 12:52:30 +0000 (13:52 +0100)]
Fix issue #2790
Riyad Preukschas [Mon, 28 Jan 2013 12:47:00 +0000 (04:47 -0800)]
Merge pull request #2798 from Xylakant/patch-2
remove incorrect information about the api version
Lennart Rosam [Mon, 28 Jan 2013 12:04:23 +0000 (13:04 +0100)]
Merge remote-tracking branch 'github/master'
Lennart Rosam [Mon, 28 Jan 2013 11:54:07 +0000 (12:54 +0100)]
Fix rake task - Update method name
Felix Gilcher [Mon, 28 Jan 2013 09:59:39 +0000 (10:59 +0100)]
remove incorrect information about the api version
The API version is currently not equal to the gitlab major version number. Gitlab 4.1
still uses API version 3. Point to the lib/api.rb file instead which contains the
autoritative information.
Dmitriy Zaporozhets [Mon, 28 Jan 2013 06:59:34 +0000 (08:59 +0200)]
fix tests
Dmitriy Zaporozhets [Sun, 27 Jan 2013 19:41:23 +0000 (11:41 -0800)]
Merge pull request #2153 from koenpunt/commit-diff-views
Added swipe view for image diff
Koen Punt [Sat, 1 Dec 2012 12:49:21 +0000 (13:49 +0100)]
Updated commit diff view with some minor visual modifications
Prepared diff view for multiple view modes
Converted commits.js to coffeescript
image info in separate coffeescript file
Added swipe view mode
Added onion skin viewMode
Dmitriy Zaporozhets [Sun, 27 Jan 2013 17:09:40 +0000 (19:09 +0200)]
Add deploy.html for symlink if maintaince
Dmitriy Zaporozhets [Sun, 27 Jan 2013 16:52:37 +0000 (08:52 -0800)]
Merge pull request #2768 from rlaneve/feature/queued-web-hooks
Updates web hooks to process via queue
Dmitriy Zaporozhets [Sun, 27 Jan 2013 16:47:19 +0000 (18:47 +0200)]
Pager.js to coffee
Dmitriy Zaporozhets [Sun, 27 Jan 2013 13:55:22 +0000 (05:55 -0800)]
Merge pull request #2787 from gitlabhq/features/projects_page
Feature: Projects page
Dmitriy Zaporozhets [Sun, 27 Jan 2013 13:41:35 +0000 (15:41 +0200)]
feature tests
Dmitriy Zaporozhets [Sun, 27 Jan 2013 12:10:42 +0000 (14:10 +0200)]
Fix features
Dmitriy Zaporozhets [Sun, 27 Jan 2013 11:20:23 +0000 (13:20 +0200)]
Fixed dashboard show specs
Dmitriy Zaporozhets [Sun, 27 Jan 2013 11:12:30 +0000 (13:12 +0200)]
Make group name a link at header
Dmitriy Zaporozhets [Sun, 27 Jan 2013 10:56:20 +0000 (12:56 +0200)]
Dashboard to resource
Dmitriy Zaporozhets [Sun, 27 Jan 2013 10:34:27 +0000 (12:34 +0200)]
Add projects page to dashboard. Remove projects pagination on dashboard
Riyad Preukschas [Sat, 26 Jan 2013 19:51:17 +0000 (11:51 -0800)]
Merge pull request #2784 from AlexDenisov/gitlab_check_environment
Missing environment added to 'Try fixing it' block
Alex Denisov [Sat, 26 Jan 2013 14:22:48 +0000 (14:22 +0000)]
Missed environment added to 'Try fixing it' block
Dmitriy Zaporozhets [Sat, 26 Jan 2013 10:15:38 +0000 (12:15 +0200)]
Fix projects in admin -> user -> show
Dmitriy Zaporozhets [Sat, 26 Jan 2013 10:08:34 +0000 (12:08 +0200)]
Fix application crashes after #2772
Dmitriy Zaporozhets [Fri, 25 Jan 2013 21:45:08 +0000 (13:45 -0800)]
Merge pull request #2772 from zzet/bugfix/path_and_page-project-member-access-#2745
fix edit project members access link and page fixes refs #2745
Dmitriy Zaporozhets [Fri, 25 Jan 2013 21:42:52 +0000 (13:42 -0800)]
Merge pull request #2777 from zzet/add_project_button
Add assign project to team button on team page
Andrey Kumanyaev [Fri, 25 Jan 2013 21:14:36 +0000 (01:14 +0400)]
Display actual user role (admin or not) in team members list
Andrey Kumanyaev [Fri, 25 Jan 2013 20:38:21 +0000 (00:38 +0400)]
Edit create new team text
Andrey Kumanyaev [Fri, 25 Jan 2013 20:37:55 +0000 (00:37 +0400)]
fix copied code. Add assign projects button.
Andrey Kumanyaev [Fri, 25 Jan 2013 19:19:31 +0000 (23:19 +0400)]
simple cleanup code %)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:38:24 +0000 (22:38 +0400)]
rewrite admin users controller (use 1 variable and find by username)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:37:38 +0000 (22:37 +0400)]
fix links in admin group view page (user links)
Andrey Kumanyaev [Fri, 25 Jan 2013 18:35:58 +0000 (22:35 +0400)]
username is default param to User
Andrey Kumanyaev [Fri, 25 Jan 2013 18:35:31 +0000 (22:35 +0400)]
Update user finding (by username) in teams members (team of users) controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:34:49 +0000 (22:34 +0400)]
Update user finding (by username) in teams_members (project team) controller
Andrey Kumanyaev [Fri, 25 Jan 2013 18:33:49 +0000 (22:33 +0400)]
Update user finding (by username) in admin teams members controller
Andrey Kumanyaev [Fri, 25 Jan 2013 17:20:15 +0000 (21:20 +0400)]
fix edit project members access link and page fixes refs #2745
Dmitriy Zaporozhets [Fri, 25 Jan 2013 16:24:22 +0000 (08:24 -0800)]
Merge pull request #2769 from hiroponz/fix-not-showing-tooltip
Fix not showing tooltip on network graph
Sato Hiroyuki [Fri, 25 Jan 2013 15:52:11 +0000 (00:52 +0900)]
Fix not showing tooltip on network graph
Ryan LaNeve [Thu, 24 Jan 2013 20:15:24 +0000 (15:15 -0500)]
Updates project to process web hooks async via sidekiq.
A new queue of "project_web_hook" is used to process web hooks asynchronously, allowing each to succeed/fail (and be retried) independently.
(Basically, project web hooks now process the same as system hooks.)
Dmitriy Zaporozhets [Fri, 25 Jan 2013 15:26:00 +0000 (17:26 +0200)]
refactor add to team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 15:18:27 +0000 (17:18 +0200)]
Fix teams + gitolite access
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:36:14 +0000 (16:36 +0200)]
teams refactoring and cleanup pt.1
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:25:43 +0000 (16:25 +0200)]
show new group, new team links in profile
Dmitriy Zaporozhets [Fri, 25 Jan 2013 14:18:37 +0000 (16:18 +0200)]
Fix redirects. Add link to new team and new group
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:51:45 +0000 (15:51 +0200)]
Fix security issues with teams
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:42:41 +0000 (15:42 +0200)]
Fix mass-assignment. Dont allow users w/o access to create team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 13:36:10 +0000 (15:36 +0200)]
fix User.potential_team_members
Dmitriy Zaporozhets [Fri, 25 Jan 2013 12:18:23 +0000 (14:18 +0200)]
fix 1145
Dmitriy Zaporozhets [Fri, 25 Jan 2013 11:56:04 +0000 (13:56 +0200)]
Fix project adding to team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 11:47:54 +0000 (13:47 +0200)]
Fix removeing project if repo not exists
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:36:15 +0000 (11:36 +0200)]
Fixing team tests
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:30:49 +0000 (11:30 +0200)]
allow/deny user to create group/team
Dmitriy Zaporozhets [Fri, 25 Jan 2013 09:08:22 +0000 (11:08 +0200)]
can_create_group, can_create_team boolean fields for user