OSDN Git Service
Dmitriy Zaporozhets [Thu, 13 Jun 2013 18:09:26 +0000 (18:09 +0000)]
Merge branch 'feature/password_expire' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 13 Jun 2013 18:06:27 +0000 (21:06 +0300)]
Force user password change for users created by admin
Dmitriy Zaporozhets [Thu, 13 Jun 2013 17:21:51 +0000 (20:21 +0300)]
Prevent infinit password change by settin password_expires_at to nil
Dmitriy Zaporozhets [Thu, 13 Jun 2013 17:16:48 +0000 (20:16 +0300)]
Fix password set form and infinite loop
Dmitriy Zaporozhets [Thu, 13 Jun 2013 17:06:33 +0000 (20:06 +0300)]
Force admin to change password after first sign-in
Dmitriy Zaporozhets [Thu, 13 Jun 2013 17:01:35 +0000 (20:01 +0300)]
Add password_expires_at to users table
Dmitriy Zaporozhets [Thu, 13 Jun 2013 16:56:26 +0000 (19:56 +0300)]
Better naming for some project tabs
Dmitriy Zaporozhets [Thu, 13 Jun 2013 16:53:04 +0000 (19:53 +0300)]
Password expire: implement password resource inside profile. add before_fiter check
Dmitriy Zaporozhets [Thu, 13 Jun 2013 14:47:04 +0000 (17:47 +0300)]
use bold font for active tab
Dmitriy Zaporozhets [Thu, 13 Jun 2013 14:41:21 +0000 (17:41 +0300)]
Better commit button after file edit
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:59:27 +0000 (10:59 +0300)]
Prevent overflow of comment code in event body. Add border-radius to highlight code inside note body
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:42:45 +0000 (10:42 +0300)]
Hide sign-in bottom block if no providers
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:24:01 +0000 (10:24 +0300)]
Team admin should be able to see settings tab
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:15:52 +0000 (00:15 -0700)]
Merge pull request #4296 from mmlb/fix-asciidoc-rendering
Add asciidoctor gem.
Dmitriy Zaporozhets [Thu, 13 Jun 2013 07:07:06 +0000 (10:07 +0300)]
update omniauth dependency
Dmitriy Zaporozhets [Thu, 13 Jun 2013 06:58:03 +0000 (09:58 +0300)]
Disable threadsafe! for rake tasks
Manuel Mendez [Thu, 2 May 2013 13:22:19 +0000 (10:22 -0300)]
Add asciidoctor gem.
Fixes issue #3506.
Dmitriy Zaporozhets [Wed, 12 Jun 2013 19:11:35 +0000 (22:11 +0300)]
Add path blacklist
Dmitriy Zaporozhets [Wed, 12 Jun 2013 13:43:58 +0000 (16:43 +0300)]
Fix inline diff issue. See #3150
Dmitriy Zaporozhets [Wed, 12 Jun 2013 10:43:45 +0000 (10:43 +0000)]
Merge branch 'sing-test-in-readme' of /home/git/repositories/gitlab/gitlabhq
Sytse Sijbrandij [Wed, 12 Jun 2013 08:00:05 +0000 (10:00 +0200)]
Add single test to the readme, should not use rake.
Dmitriy Zaporozhets [Tue, 11 Jun 2013 15:54:15 +0000 (15:54 +0000)]
Merge branch 'feature/threadsafe' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Tue, 11 Jun 2013 15:15:18 +0000 (18:15 +0300)]
cattr_accessor is not threadsafe!
Dmitriy Zaporozhets [Tue, 11 Jun 2013 15:03:13 +0000 (18:03 +0300)]
Enable threadsafe. Preload lib/
Dmitriy Zaporozhets [Tue, 11 Jun 2013 14:07:51 +0000 (07:07 -0700)]
Merge pull request #4148 from jlgeering/secure-gravatar-urls
enforce secure gravatar urls when Gitlab.config.gitlab.https is set
Dmitriy Zaporozhets [Tue, 11 Jun 2013 13:58:21 +0000 (16:58 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 11 Jun 2013 13:57:52 +0000 (16:57 +0300)]
Refactor Project.abandoned method
Dmitriy Zaporozhets [Tue, 11 Jun 2013 13:44:18 +0000 (06:44 -0700)]
Merge pull request #4176 from Andrew8xx8/patch-2
500 error on showing not existed commit fixed
Dmitriy Zaporozhets [Tue, 11 Jun 2013 12:50:25 +0000 (15:50 +0300)]
Style page for project assign to team. Fix test for admin:teams
Dmitriy Zaporozhets [Tue, 11 Jun 2013 12:39:19 +0000 (15:39 +0300)]
Restyle admin:teams:show
Dmitriy Zaporozhets [Tue, 11 Jun 2013 12:10:45 +0000 (15:10 +0300)]
mention puma cluster mode for bigger instances
Dmitriy Zaporozhets [Tue, 11 Jun 2013 11:27:27 +0000 (14:27 +0300)]
Fixed users_select_tag method
Dmitriy Zaporozhets [Tue, 11 Jun 2013 11:22:33 +0000 (14:22 +0300)]
Keep namespace name/username synced with user
Dmitriy Zaporozhets [Tue, 11 Jun 2013 11:17:37 +0000 (14:17 +0300)]
Prevent Project.all & User.all in selectboxes
Dmitriy Zaporozhets [Tue, 11 Jun 2013 10:54:58 +0000 (13:54 +0300)]
fix group:people tests after prev commit
Dmitriy Zaporozhets [Tue, 11 Jun 2013 10:51:22 +0000 (13:51 +0300)]
Group people management: replace selectbox with ajax one.
Dmitriy Zaporozhets [Tue, 11 Jun 2013 09:31:05 +0000 (12:31 +0300)]
Fix README.txt rendering. Solution by @dfyx
Dmitriy Zaporozhets [Tue, 11 Jun 2013 09:13:58 +0000 (02:13 -0700)]
Merge pull request #4065 from bbodenmiller/release-todos
add creating new release guide
Dmitriy Zaporozhets [Tue, 11 Jun 2013 09:12:06 +0000 (02:12 -0700)]
Merge pull request #4140 from amacarthur/restore-fixes-clean
fixes for gitlab restore with non-standard backup and repo dirs
Dmitriy Zaporozhets [Tue, 11 Jun 2013 08:48:18 +0000 (01:48 -0700)]
Merge pull request #4224 from hiroponz/fix-abort-gitlab-app-check
Fix abort gitlab:app:check
Dmitriy Zaporozhets [Tue, 11 Jun 2013 08:06:50 +0000 (01:06 -0700)]
Merge pull request #4244 from adaugherity/check_script_user
use git user in check script
Dmitriy Zaporozhets [Tue, 11 Jun 2013 08:03:03 +0000 (01:03 -0700)]
Merge pull request #4257 from jojosch/fix/routing-commit-with-#
Routing fix Commit-List: branch with # and + in name
Dmitriy Zaporozhets [Tue, 11 Jun 2013 07:02:17 +0000 (10:02 +0300)]
use public_icon/private_icon helper
Dmitriy Zaporozhets [Tue, 11 Jun 2013 06:54:01 +0000 (09:54 +0300)]
Solve inconsistency between network graph & stat graphs
Dmitriy Zaporozhets [Tue, 11 Jun 2013 06:36:15 +0000 (09:36 +0300)]
IMprove stat-graph css
Dmitriy Zaporozhets [Mon, 10 Jun 2013 18:40:23 +0000 (21:40 +0300)]
Error page if forking fails
Dmitriy Zaporozhets [Mon, 10 Jun 2013 18:09:52 +0000 (21:09 +0300)]
replace font-awesome gem. Use fork icon
Dmitriy Zaporozhets [Mon, 10 Jun 2013 16:44:32 +0000 (19:44 +0300)]
Fix assign-to-me button align at issue form
Dmitriy Zaporozhets [Mon, 10 Jun 2013 16:39:14 +0000 (09:39 -0700)]
Merge pull request #4259 from jojosch/fix/issue-label-autocomlete-on-click
Open the issue tag list on click
Dmitriy Zaporozhets [Mon, 10 Jun 2013 15:27:35 +0000 (18:27 +0300)]
5.3.0 in beta now
Dmitriy Zaporozhets [Mon, 10 Jun 2013 14:09:30 +0000 (17:09 +0300)]
Fix admin:group spinach. Remove selecting .all projects for admin user at teams page
Dmitriy Zaporozhets [Mon, 10 Jun 2013 13:26:11 +0000 (16:26 +0300)]
Better styling for admin:teams:index page
Dmitriy Zaporozhets [Mon, 10 Jun 2013 12:58:51 +0000 (15:58 +0300)]
Restyle admin:group:show. Remove .all calls fro users, projects here
Dmitriy Zaporozhets [Mon, 10 Jun 2013 09:36:22 +0000 (12:36 +0300)]
Update gitlab-grack. Fixes issue with --depth option
Dmitriy Zaporozhets [Mon, 10 Jun 2013 05:54:20 +0000 (22:54 -0700)]
Merge pull request #4260 from dosire/pygments-name
Fix pygment lexer 500 errors when an alias is used instead of a name.
Johannes Schleifenbaum [Sun, 9 Jun 2013 21:47:55 +0000 (23:47 +0200)]
Commit List and Tree allow also + in branch name
Sytse Sijbrandij [Sun, 9 Jun 2013 19:30:20 +0000 (21:30 +0200)]
Fix pygment lexer 500 errors when an alias is used instead of a name.
Johannes Schleifenbaum [Sun, 9 Jun 2013 16:36:08 +0000 (18:36 +0200)]
Open the issue tag list on click
Johannes Schleifenbaum [Sun, 9 Jun 2013 13:00:42 +0000 (15:00 +0200)]
Routing fix Commit-List: switch to branch with # in name
Dmitriy Zaporozhets [Sat, 8 Jun 2013 15:32:00 +0000 (18:32 +0300)]
fix layout for snippets
Dmitriy Zaporozhets [Sat, 8 Jun 2013 14:10:25 +0000 (17:10 +0300)]
add data-page property to all pages
Dmitriy Zaporozhets [Sat, 8 Jun 2013 13:26:57 +0000 (16:26 +0300)]
Fix determine of layout for group/team
Dmitriy Zaporozhets [Fri, 7 Jun 2013 15:46:33 +0000 (18:46 +0300)]
Refactor event title for notes
Dmitriy Zaporozhets [Fri, 7 Jun 2013 15:33:16 +0000 (18:33 +0300)]
Fix event note output
Dmitriy Zaporozhets [Fri, 7 Jun 2013 15:28:47 +0000 (18:28 +0300)]
remove outdated permission option from help page
Dmitriy Zaporozhets [Fri, 7 Jun 2013 14:41:01 +0000 (17:41 +0300)]
navless layout for new group/team. Proper title for this pages
Dmitriy Zaporozhets [Fri, 7 Jun 2013 14:33:43 +0000 (17:33 +0300)]
Show native head panel for logged-in users at public area
Dmitriy Zaporozhets [Fri, 7 Jun 2013 14:31:12 +0000 (17:31 +0300)]
Use navless layout when it makes sense
Dmitriy Zaporozhets [Fri, 7 Jun 2013 14:18:11 +0000 (17:18 +0300)]
Fix dashboard lost if comment on commit
Ben Bodenmiller [Fri, 24 May 2013 23:53:32 +0000 (16:53 -0700)]
update upgrade guide with backup, db specific commands, config changes, check, and restore
Daniel Salmerón Amselem [Tue, 28 May 2013 22:13:42 +0000 (01:13 +0300)]
Fix typo in smtp_settings.rb.sample
Andrew Daugherity [Thu, 6 Jun 2013 21:25:07 +0000 (16:25 -0500)]
use git user in check script
No more separate gitlab user since 5.0.
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
Sato Hiroyuki [Thu, 6 Jun 2013 01:10:51 +0000 (10:10 +0900)]
Fix abort gitlab:app:check
When the file that pointed git bin_path in gitlab.yml dose'nt exist,
bundle rake gitlab:app:check would be aborted.
refs #4205
Dmitriy Zaporozhets [Wed, 5 Jun 2013 19:25:27 +0000 (22:25 +0300)]
Restyle snippets