Commit Graph
5095 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4d9bdab005 Style pagination 2013-05-06 20:56:45 +03:00
Dmitriy Zaporozhets 930f4366ba Usability improvements to deploy leys 2013-05-06 20:41:08 +03:00
Dmitriy Zaporozhets 3022b9fdbf Merge pull request #3847 from boldt/unicorn-to-puma
Fixed forgotten unicorn to puma in a comment.
2013-05-06 08:11:11 -07:00
Dennis Boldt f64874c1f5 Fixed forgotten unicorn to puma in a comment. 2013-05-06 16:52:47 +02:00
Dmitriy Zaporozhets 298d089740 Update CHANGELOG 2013-05-06 17:50:30 +03:00
Dmitriy Zaporozhets caf065007a Merge branch 'feature/improve_deploy_keys' of /home/git/repositories/gitlab/gitlabhq 2013-05-06 14:43:21 +00:00
Dmitriy Zaporozhets 749d3383cc Add migration code for existing deploy keys 2013-05-06 17:42:13 +03:00
Dmitriy Zaporozhets 4528fa9817 modify api to work with new deploy keys 2013-05-06 16:24:58 +03:00
Dmitriy Zaporozhets 4c9030359c Merge pull request #3845 from senny/link_contribution_guide_to_test_section
link contribution guide to test section in README
2013-05-06 06:20:15 -07:00
Yves Senn 1d16e4953a link contribution guide to test section in README 2013-05-06 15:17:37 +02:00
Dmitriy Zaporozhets 1882baa1aa Feature: Deploy keys between projects 2013-05-06 15:10:55 +03:00
Dmitriy Zaporozhets 8e4625af61 Remove project_id from keys table 2013-05-06 15:10:05 +03:00
Dmitriy Zaporozhets b7f1cf9f49 Feature tests for deploy keys 2013-05-06 15:09:41 +03:00
Dmitriy Zaporozhets 42b86b79d0 Model specs for DeployKeys 2013-05-06 15:09:26 +03:00
Dmitriy Zaporozhets ff346c01fa Check git version in gitlab:check 2013-05-06 15:08:53 +03:00
Dmitriy Zaporozhets a735ce2aa7 migrations for ssh key STI and deploy keys <-> projects relation 2013-05-06 12:27:54 +03:00
Dmitriy Zaporozhets 543d86f351 Create DeployKey & DeployKeysProject models. Bulding many to many relation between deploy keys and projects 2013-05-06 12:26:36 +03:00
Dmitriy Zaporozhets 53413f128d Merge pull request #3837 from majjacz/patch-1
Changed forgotten unicorn to puma in the init script
2013-05-05 23:43:12 -07:00
Dmitriy Zaporozhets 0115d5a2ca Merge pull request #3841 from falk/master
Remove 2000 char limit on issue description
2013-05-05 23:42:42 -07:00
falk ba9baff8d9 Remove 2000 char limit on issue description textarea 2013-05-05 15:54:22 +02:00
Dmitriy Zaporozhets 493b5ff011 Add smtp_settings sample 2013-05-05 12:48:32 +03:00
majjacz 93dccb7298 Changed forgotten unicorn to puma in the init script 2013-05-04 21:39:53 +02:00
Dmitriy Zaporozhets ca244c35cc Reorder buttons on clone panel of project 2013-05-04 00:08:49 +03:00
Dmitriy Zaporozhets afc3c216c4 Merge pull request #3829 from amacarthur/ruby2-fork-fix
fork failing when calling initialize_dup
2013-05-03 12:56:00 -07:00
Angus MacArthur 793ab5a1ab fork failing when calling initialize_dup
initialize_dup has been made private as of ruby 2.0.0. I have
corrected it to call the publicly available dup method
2013-05-03 12:13:12 -04:00
Dmitriy Zaporozhets 204bd0b066 Merge pull request #3814 from tsl0922/fix-ace-mode-404
fix ace editor Syntax Highlighter mode load 404
2013-05-03 03:55:20 -07:00
Dmitriy Zaporozhets f23d01b789 Merge pull request #3818 from bbodenmiller/patch-1
add proper code/command formatting where missing in CONTRIBUTING.md
2013-05-03 03:53:26 -07:00
Dmitriy Zaporozhets 3466cc5507 Merge pull request #3820 from bbodenmiller/patch-3
link to RSpec. related to #3810
2013-05-03 03:51:53 -07:00
Dmitriy Zaporozhets 28b6c4dcbb Merge pull request #3817 from gitlabhq/link_to_spinach_in_readm
link to spinach in the README. Closes #3810
2013-05-03 03:51:03 -07:00
tsl0922 01817135e9 fix ace mode 404 2013-05-03 18:09:57 +08:00
Ben Bodenmiller ccd181d7c5 link to RSpec. related to #3810 2013-05-03 01:03:49 -07:00
Ben Bodenmiller fc180a19c2 add proper code/command formatting where missing 2013-05-03 00:48:14 -07:00
Yves Senn 895b16eac8 link to spinach in the README. Closes #3810 2013-05-03 10:14:44 +03:00
Dmitriy Zaporozhets 2fc236177f Merge pull request #3801 from holdtotherod/feature/internally-public-projects
Internally public projects
2013-05-03 00:00:48 -07:00
Dmitriy Zaporozhets f40d4e6685 Merge pull request #3597 from amacarthur/fork-pull-request
updated fork feature to use gitlab-shell for v5 of gitlab
2013-05-02 23:41:07 -07:00
Saito 36efe0f580 Merge pull request #3634 from tsl0922/patch-grack-auth
fix http push 401 and 500 with some git clients
2013-05-02 22:13:43 -07:00
tsl0922 f1c9b05868 better fix for encoding error 2013-05-03 11:31:23 +08:00
tsl0922 4e055e8a63 fix: UTF-8 encoding error 2013-05-03 10:58:53 +08:00
tsl0922 ef61d1f200 fix http push 401 2013-05-03 10:58:53 +08:00
Angus MacArthur ec63804831 Made fixes suggested by @randx in pull request
See https://github.com/gitlabhq/gitlabhq/pull/3597#discussion-diff-4014638
2013-05-02 16:41:33 -04:00
Angus MacArthur de8df1be1a Fix bug for repeated fork requests
When asking to fork a project and a project with the same name
already exists (likely from a previous fork), the recovery from
the fork failure would inadvertantly delete the repo of the
existing destination project.
2013-05-02 16:41:24 -04:00
Stephen Lottermoser 8589f0f400 Non-logged in users see public project names as static text
In the public area, project names are shown as static text for
non-logged in users, while logged-in users are given project
names as links they can follow to the project's page.
2013-05-02 13:32:09 -07:00
Dmitriy Zaporozhets ae006dd90b Merge pull request #3645 from lucasuyezu/alphabetically_sorted
Assignees are now sorted alphabetically.
2013-05-02 05:51:33 -07:00
Dmitriy Zaporozhets fe838588ae Merge pull request #3704 from former03/feature_bugfix_js_memberadd_realtive_url_root
[BUGFIX] User suggest at team_members/new not working with relative_url_root
2013-05-02 05:35:26 -07:00
Dmitriy Zaporozhets c8649c5d60 Fix issue with undefined dispather page 2013-05-02 15:28:07 +03:00
Dmitriy Zaporozhets 92f0473354 Move search autocomplete call to dispatcher 2013-05-02 14:51:47 +03:00
Dmitriy Zaporozhets 0b981eb9b3 coffescript refactoring pt.1 2013-05-02 14:36:53 +03:00
Dmitriy Zaporozhets 37f3d0f25b Fix newlines in how-to-merge. Added steps description. Fixes #3772 2013-05-02 13:23:50 +03:00
Dmitriy Zaporozhets 2aa620c25a move more inline js to handle via dispatcher 2013-05-02 11:46:45 +03:00
Dmitriy Zaporozhets 6473aaf877 Remove on-ready for NoteList event 2013-05-02 11:23:58 +03:00