OSDN Git Service
Dmitriy Zaporozhets [Thu, 6 Jun 2013 18:24:25 +0000 (11:24 -0700)]
Merge pull request #4163 from jdamick/slow_team_list
addresses issue #4156
Dmitriy Zaporozhets [Thu, 6 Jun 2013 17:16:18 +0000 (20:16 +0300)]
rollback travis ruby1.9 version
Dmitriy Zaporozhets [Thu, 6 Jun 2013 16:25:55 +0000 (09:25 -0700)]
Merge pull request #4164 from hiroponz/fix-postgres-error
Fix postgres error when displaying network graph.
Dmitriy Zaporozhets [Thu, 6 Jun 2013 16:19:58 +0000 (09:19 -0700)]
Merge pull request #4227 from boldt/master
Typos
Dmitriy Zaporozhets [Thu, 6 Jun 2013 16:19:17 +0000 (19:19 +0300)]
API: project events
Dmitriy Zaporozhets [Thu, 6 Jun 2013 15:40:05 +0000 (18:40 +0300)]
API: Add last_activity_at date to project entity
Dmitriy Zaporozhets [Thu, 6 Jun 2013 15:28:15 +0000 (18:28 +0300)]
rvm get stable for travis
Dmitriy Zaporozhets [Thu, 6 Jun 2013 15:24:10 +0000 (08:24 -0700)]
Merge pull request #4178 from docwhat/use-COLOR_SCHEMES
design pages now uses the COLOR_SCHEMES
Dmitriy Zaporozhets [Thu, 6 Jun 2013 15:20:58 +0000 (08:20 -0700)]
Merge pull request #4204 from axilleas/initd_check-fix
Read init script recipe from Rails.root path. Fix #4174
Dmitriy Zaporozhets [Thu, 6 Jun 2013 15:08:44 +0000 (18:08 +0300)]
run 1.9.3-p492 on travis
Dmitriy Zaporozhets [Thu, 6 Jun 2013 15:01:03 +0000 (18:01 +0300)]
API: implement retrieve of repository tree
Dmitriy Zaporozhets [Thu, 6 Jun 2013 14:14:50 +0000 (07:14 -0700)]
Merge pull request #4206 from babatakao/authorize_all_teams_to_admin
Authorize all teams to admin: fix 500 error on showing team page.
Dmitriy Zaporozhets [Thu, 6 Jun 2013 13:16:49 +0000 (16:16 +0300)]
API: Fix repository commits pagination
Dmitriy Zaporozhets [Thu, 6 Jun 2013 13:10:24 +0000 (16:10 +0300)]
Fix snippet raw content being escaped
Dmitriy Zaporozhets [Thu, 6 Jun 2013 12:40:26 +0000 (15:40 +0300)]
Fix api readme links
Dmitriy Zaporozhets [Thu, 6 Jun 2013 11:16:08 +0000 (14:16 +0300)]
Allow forking of public projects by authenticated users. Fixes #4152
Dmitriy Zaporozhets [Thu, 6 Jun 2013 11:02:29 +0000 (14:02 +0300)]
public_icon, private_icon helpers
Dmitriy Zaporozhets [Thu, 6 Jun 2013 10:38:13 +0000 (13:38 +0300)]
Move search to separate layout
Dmitriy Zaporozhets [Thu, 6 Jun 2013 10:19:23 +0000 (13:19 +0300)]
Improve api docs
Dmitriy Zaporozhets [Thu, 6 Jun 2013 09:37:51 +0000 (12:37 +0300)]
Split Project api on several parts: deploy_keys, hooks, snippets etc
Dmitriy Zaporozhets [Thu, 6 Jun 2013 09:32:05 +0000 (12:32 +0300)]
Fix milestone api docs: invalid param for close
Dennis Boldt [Thu, 6 Jun 2013 08:47:54 +0000 (10:47 +0200)]
Typos
Dmitriy Zaporozhets [Thu, 6 Jun 2013 08:31:40 +0000 (11:31 +0300)]
Fix wrong documentation for issue close api. Fixes #3548
Dmitriy Zaporozhets [Thu, 6 Jun 2013 06:05:58 +0000 (23:05 -0700)]
Merge pull request #4155 from babatakao/selectable_master_project_deploy_keys
Selectable deploy keys contain master projects
Dmitriy Zaporozhets [Thu, 6 Jun 2013 06:04:25 +0000 (09:04 +0300)]
Fix snippets test
Dmitriy Zaporozhets [Thu, 6 Jun 2013 05:59:46 +0000 (05:59 +0000)]
Merge branch 'server-token' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 5 Jun 2013 19:25:27 +0000 (22:25 +0300)]
Restyle snippets
Sytse Sijbrandij [Wed, 5 Jun 2013 18:08:42 +0000 (20:08 +0200)]
This commit got lost https://github.com/gitlabhq/gitlab-recipes/commit/
76ba45246e93e9c764580fe54ccfe38da751afbe
Christian Höltje [Mon, 3 Jun 2013 16:34:07 +0000 (12:34 -0400)]
design pages now uses the COLOR_SCHEMES
This unifies the code color-scheme code and makes
adding new schemes a little easier.
Dmitriy Zaporozhets [Wed, 5 Jun 2013 15:11:56 +0000 (18:11 +0300)]
mention network graphs author in cahngelog
Dmitriy Zaporozhets [Wed, 5 Jun 2013 12:50:11 +0000 (15:50 +0300)]
Its better to load graph with ajax since it requires ~10 seconds for bigger projects to finish up
Dmitriy Zaporozhets [Wed, 5 Jun 2013 11:49:48 +0000 (14:49 +0300)]
Fix new snippet tab highlight. Added new entries to changelog
Dmitriy Zaporozhets [Wed, 5 Jun 2013 10:30:48 +0000 (13:30 +0300)]
Style a bit a person section in graph
Dmitriy Zaporozhets [Wed, 5 Jun 2013 10:25:04 +0000 (03:25 -0700)]
Merge pull request #4212 from karlo57/feature/graphs
Contributors Graph
Karlo Soriano [Thu, 9 May 2013 05:00:56 +0000 (13:00 +0800)]
Contributors graphs feature for GitLab
Created tests and refactored some code along the way
Added stat graph util spec, refactored code
finsihed up tests and refactors
finsihed up tests and refactors
babatakao [Wed, 5 Jun 2013 05:34:13 +0000 (14:34 +0900)]
Authorize all teams to admin: fix 500 error on showing team page.
500 error was occured in the following steps:
1. user1 creates new team "team1".
2. Assign team1 to project1.
3. Sign in as admin. This admin is not a member of team1.
4. Open project1 team setting page (/project1/team).
5. Click "team1" link in "Assigned teams" area.
6. 500 error.
Fixed this issue.
Axilleas Pipinellis [Tue, 4 Jun 2013 22:11:43 +0000 (01:11 +0300)]
Read init script recipe from Rails.root path. Fix #4174
Signed-off-by: Axilleas Pipinellis <axilleas@archlinux.gr>
babatakao [Tue, 4 Jun 2013 14:50:51 +0000 (23:50 +0900)]
Selectable deploy keys contain master projects
Dmitriy Zaporozhets [Tue, 4 Jun 2013 17:35:14 +0000 (20:35 +0300)]
Merge branch 'Andrew8xx8-gist'
Dmitriy Zaporozhets [Tue, 4 Jun 2013 15:50:42 +0000 (18:50 +0300)]
Fixed ability and modify UI a bit
Dmitriy Zaporozhets [Tue, 4 Jun 2013 15:36:22 +0000 (18:36 +0300)]
Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist
Conflicts:
Gemfile.lock
app/models/ability.rb
app/models/project.rb
app/views/snippets/_form.html.haml
db/schema.rb
features/steps/shared/paths.rb
spec/factories.rb
spec/models/project_spec.rb
Dmitriy Zaporozhets [Tue, 4 Jun 2013 15:20:50 +0000 (18:20 +0300)]
Remove project cache before project.destroy
Dmitriy Zaporozhets [Tue, 4 Jun 2013 14:01:41 +0000 (17:01 +0300)]
Fix project.show spinach test
Dmitriy Zaporozhets [Tue, 4 Jun 2013 13:39:59 +0000 (16:39 +0300)]
More entries in changelog
Dmitriy Zaporozhets [Tue, 4 Jun 2013 13:35:08 +0000 (16:35 +0300)]
Do not render project events since we render them again via ajax request
Dmitriy Zaporozhets [Tue, 4 Jun 2013 08:59:35 +0000 (01:59 -0700)]
Merge pull request #4177 from docwhat/fix-user_color_scheme_class
user_color_scheme_class with no current_user
Dmitriy Zaporozhets [Tue, 4 Jun 2013 08:38:34 +0000 (01:38 -0700)]
Merge pull request #4188 from erkasraim/commit_log_twice
fixed commit tab page shows commit log twice
erkasraim [Tue, 4 Jun 2013 05:07:33 +0000 (14:07 +0900)]
fixed commit tab page shows commit log twice
Dmitriy Zaporozhets [Mon, 3 Jun 2013 18:01:07 +0000 (21:01 +0300)]
Fix deploy key api 500 if key is empty
Dmitriy Zaporozhets [Mon, 3 Jun 2013 16:49:04 +0000 (19:49 +0300)]
Add api to collect owned user projects. Api deploy_key.create: Enable deploy key if it exist in other owned project
Christian Höltje [Mon, 3 Jun 2013 15:31:35 +0000 (11:31 -0400)]
user_color_scheme_class with current_user
This refactors the `user_color_scheme_class` to use
a hash with a default. This prevents problems
with workers that don't have access to the
current_user.
Fixes issue #2758
Dmitriy Zaporozhets [Mon, 3 Jun 2013 06:34:10 +0000 (23:34 -0700)]
Merge pull request #4161 from Undev/fix-#4109
Fix bug with team assignation on project from #4109
Dmitriy Zaporozhets [Mon, 3 Jun 2013 06:31:43 +0000 (23:31 -0700)]
Merge pull request #4158 from evalhub/master
Group/Team Atom feed 500 error
Sato Hiroyuki [Sun, 2 Jun 2013 07:05:48 +0000 (07:05 +0000)]
Fix postgres error when displaying network graph.
fix #4149
jdamick [Sun, 2 Jun 2013 02:44:11 +0000 (22:44 -0400)]
addresses issue #4156
when there are large number of members of in a team, for me 260+
From:
[2013-06-01 00:55:01] Rendered team_members/_team_member.html.haml (206.9ms)
[2013-06-01 00:55:01] Rendered team_members/_team.html.haml (54479.2ms)
To:
[2013-06-02 02:40:36] Rendered team_members/_team_member.html.haml (2.1ms)
[2013-06-02 02:40:36] Rendered team_members/_team.html.haml (1412.6ms)
Andrey Kumanyaev [Sat, 1 Jun 2013 15:40:20 +0000 (19:40 +0400)]
No check access if no relation between user and project
Andrey Kumanyaev [Sat, 1 Jun 2013 15:24:15 +0000 (19:24 +0400)]
Fix bug with team assignation on project from #4109
evalhub [Sat, 1 Jun 2013 12:15:22 +0000 (15:15 +0300)]
Update show.atom.builder
Fix for https://github.com/gitlabhq/gitlabhq/issues/4157
evalhub [Sat, 1 Jun 2013 12:14:43 +0000 (15:14 +0300)]
Update show.atom.builder
Fix for https://github.com/gitlabhq/gitlabhq/issues/4157
Yves Senn [Fri, 31 May 2013 07:24:49 +0000 (00:24 -0700)]
Merge pull request #4147 from andrewwutw/fix-issue-tracker-guidelines-cmd-line
Fix rake gitlab:env:info command line in Issue tracker guidelines.
andrewwutw [Fri, 31 May 2013 07:17:12 +0000 (15:17 +0800)]
Fix rake gitlab:env:info command line in Issue tracker guidelines.
Dmitriy Zaporozhets [Thu, 30 May 2013 08:44:35 +0000 (11:44 +0300)]
Fix routiong specs after rename of resque controller
Dmitriy Zaporozhets [Thu, 30 May 2013 08:40:15 +0000 (11:40 +0300)]
Update membership instead of remove/add if it permissions were changed
Dmitriy Zaporozhets [Thu, 30 May 2013 08:25:34 +0000 (11:25 +0300)]
UserTeam: Fixed bug when impossible to change admin flag after checked
Dmitriy Zaporozhets [Thu, 30 May 2013 08:13:38 +0000 (11:13 +0300)]
TeamManagement: Dont update permissions if it was not changed
Dmitriy Zaporozhets [Thu, 30 May 2013 07:57:50 +0000 (10:57 +0300)]
Add permission filter to teams -> members page
Dmitriy Zaporozhets [Thu, 30 May 2013 07:57:10 +0000 (10:57 +0300)]
Added TeamMembers.js file
Dmitriy Zaporozhets [Thu, 30 May 2013 06:52:12 +0000 (23:52 -0700)]
Merge pull request #3970 from jacargentina/notes-highlight
Style target notes for easy visual identification
Dmitriy Zaporozhets [Thu, 30 May 2013 06:46:28 +0000 (09:46 +0300)]
Renames resque resource to background_jobs
Dmitriy Zaporozhets [Thu, 30 May 2013 06:46:02 +0000 (09:46 +0300)]
Prevent mailer error when note with code highlight
Dmitriy Zaporozhets [Thu, 30 May 2013 06:29:34 +0000 (23:29 -0700)]
Merge pull request #3980 from hiroponz/fix-not-displaying-slash-of-namespace
Fix not displaying a slash after namespace.
Dmitriy Zaporozhets [Thu, 30 May 2013 06:28:17 +0000 (23:28 -0700)]
Merge pull request #4037 from mitchty/master
Remove user directory path assumptions
Dmitriy Zaporozhets [Thu, 30 May 2013 06:25:40 +0000 (23:25 -0700)]
Merge pull request #4115 from bke-drewb/apidocs
Update api docs and remove old attribute from User entity.
Dmitriy Zaporozhets [Thu, 30 May 2013 06:24:56 +0000 (23:24 -0700)]
Merge pull request #4101 from bassrock/master
Update suggestion for Check.rake
Dmitriy Zaporozhets [Thu, 30 May 2013 06:23:29 +0000 (23:23 -0700)]
Merge pull request #4113 from peterlefanulumsdaine/master
grammar fix in an error message (very minor change)
Dmitriy Zaporozhets [Thu, 30 May 2013 06:17:29 +0000 (23:17 -0700)]
Merge pull request #4130 from TrevorS/fix-update-docs-5.0-5.1
adding update info regarding gitlab-shell config.yml (re: dashboard update problems)
Trevor Strieber [Wed, 29 May 2013 21:03:54 +0000 (15:03 -0600)]
adding update info regarding gitlab-shell config.yml
Dmitriy Zaporozhets [Wed, 29 May 2013 20:26:24 +0000 (23:26 +0300)]
Better styling for event pre block
Dmitriy Zaporozhets [Wed, 29 May 2013 18:41:12 +0000 (21:41 +0300)]
Fix dashboard event filter when navigate via turbolinks
Drew Blessing [Tue, 28 May 2013 23:41:15 +0000 (18:41 -0500)]
Update api docs and remove old attribute from User entity.
The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity.
Add color scheme ID to API User entity
Dmitriy Zaporozhets [Wed, 29 May 2013 10:20:13 +0000 (03:20 -0700)]
Merge pull request #4098 from pguridi/jira
Jira - Fixed Jira Issue tracker support
Dmitriy Zaporozhets [Wed, 29 May 2013 10:16:30 +0000 (13:16 +0300)]
Assign to me link on issue form
Dmitriy Zaporozhets [Wed, 29 May 2013 08:59:23 +0000 (08:59 +0000)]
Merge branch 'spelling-error' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 29 May 2013 08:57:48 +0000 (08:57 +0000)]
Merge branch 'accurate-deploy-key-message' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 29 May 2013 07:41:17 +0000 (09:41 +0200)]
Correct spelling error.
Sytse Sijbrandij [Wed, 29 May 2013 07:07:14 +0000 (09:07 +0200)]
Improve accuracy of deploy key message.
Peter LeFanu Lumsdaine [Tue, 28 May 2013 17:48:51 +0000 (14:48 -0300)]
Grammar fix in error message for blocked login (in "application_controller.rb")
Dmitriy Zaporozhets [Tue, 28 May 2013 15:59:01 +0000 (18:59 +0300)]
Unbind document scroll on page:fetch to disable endlessScroll on pages where it is not used
Dmitriy Zaporozhets [Tue, 28 May 2013 15:00:44 +0000 (18:00 +0300)]
Correct indentation in readme, fixed display of social accounts in profile
Dmitriy Zaporozhets [Tue, 28 May 2013 14:37:23 +0000 (17:37 +0300)]
Warn users to change password after account was created
Dmitriy Zaporozhets [Tue, 28 May 2013 14:24:23 +0000 (17:24 +0300)]
Version up to 5.3.0
Dmitriy Zaporozhets [Tue, 28 May 2013 14:08:21 +0000 (17:08 +0300)]
init.d: Ensure socket is removed before starting service
Yves Senn [Tue, 28 May 2013 07:14:29 +0000 (00:14 -0700)]
Merge pull request #4093 from bbodenmiller/breaking-tests
update pull request guidelines, allow for submitting of tests that expos...
Pedro Guridi [Mon, 27 May 2013 14:53:50 +0000 (11:53 -0300)]
Changed regex to support Jira issue numbering format
Jira issues numbering format are like: "PROJECT-1234".
Changed the regular expression to support Jira issues linking, in addition to the normal #123.
Added Jira Issue tracker configuration example
bassrock [Mon, 27 May 2013 19:30:54 +0000 (13:30 -0600)]
Update check.rake
Dmitriy Zaporozhets [Mon, 27 May 2013 18:02:42 +0000 (21:02 +0300)]
Fix 500 error on group.settings page
Dmitriy Zaporozhets [Mon, 27 May 2013 15:26:51 +0000 (08:26 -0700)]
Merge pull request #4067 from bbodenmiller/patch-5
add code comment about backing up folder when restoring
Dmitriy Zaporozhets [Mon, 27 May 2013 14:14:47 +0000 (17:14 +0300)]
Up grape version. Fix issue with raw content being escaped
Dmitriy Zaporozhets [Mon, 27 May 2013 12:47:20 +0000 (12:47 +0000)]
Merge branch 'double-check-after-start' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Mon, 27 May 2013 12:43:44 +0000 (15:43 +0300)]
more descriptive confirmation messages