c918000bc2
Merge pull request #3396 from Andrew8xx8/issue-button-fix
...
New issue button was not follows to external tracker if it is selected. ...
2013-03-30 15:10:08 -07:00
d55ade1686
notification scaffold
2013-03-27 19:04:29 +02:00
242f6aa218
New issue button was not follows to external tracker if it is selected. fixed #3386
2013-03-26 12:28:26 +04:00
9d92433a7c
login with both email or username
2013-03-25 16:10:14 +02:00
d0df8a6ff8
remove project edit from admin area. Redesigned project page in admin area
2013-03-25 11:07:11 +02:00
e292d7c17b
Make transfer action in project controller
2013-03-25 10:48:30 +02:00
5f159d4bc0
Merge pull request #3335 from zzet/patch-4
...
Update databases.md
2013-03-24 03:44:14 -07:00
4cc27fd9e1
Update database.yml.postgresql
2013-03-24 14:10:32 +04:00
29b0ac489b
move edit to separate controller. This fixes #3265
2013-03-24 11:57:44 +02:00
0103363191
replace Gitolited mixin with Gitlab::ShellAdapter
2013-03-21 21:01:14 +02:00
70af962963
Comment external issue tracker by default in gitlab.yml.example
2013-03-19 15:11:31 +02:00
57f3409bcc
move Wall to own resource
2013-03-19 12:35:42 +02:00
415bade302
Result of misspellings run.
...
Most of these are comments but a few are strings for users.
Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check
It runs mostly clean now.
2013-03-17 19:46:54 +00:00
71ab011a17
Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
...
Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb
2013-03-15 16:55:07 +02:00
473efc82b6
Group and team rss is valid now
2013-03-10 12:16:57 +02:00
ea9b3687db
Replace current Wiki system with Gollum Wikis.
...
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.
The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:
* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.
The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
2013-03-09 16:39:51 -08:00
3374027e3a
Merge branch 'master' into fixes/api, code clean up and tests fixed
...
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
2013-03-07 14:51:56 +01:00
9c2a6e2013
Merge pull request #3047 from mikew/capistrano-deploy-example
...
Capistrano deploy example
2013-03-07 02:08:11 -08:00
67a61c80d1
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.
2013-03-06 22:06:12 +01:00
4c1538a946
Use redis as cache storage. cache events
2013-03-06 17:30:48 +02:00
bb63459d53
Fix routing errors.
...
It should fix #2598 .
2013-03-06 16:36:10 +09:00
61cfa2a7a6
Merge branch 'master' into fixes/api
...
Conflicts:
lib/api/projects.rb
2013-03-05 22:29:49 +01:00
d5663e148f
Merge pull request #2870 from mikew/relative-url-root-default
...
default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT']
2013-03-05 06:54:31 -08:00
1c8c5c76b6
Corrected some typos in gitlab.yml.example comments
2013-03-01 23:53:37 +01:00
ed9543ff5d
update devise gem
2013-02-28 21:06:16 +02:00
b1f58fcaea
allow any attachment filenames
2013-02-28 19:29:21 +02:00
b6d0f2852d
Issues link from project page follows on remote bug tracker if it selected now
2013-02-28 16:11:14 +04:00
c6385e4135
Section name returned back to base
2013-02-28 16:11:13 +04:00
c643b50dbd
Default value for issues_tracker setting added
2013-02-28 16:11:13 +04:00
9b606ede00
Wrong default section in config. Fixed.
2013-02-28 16:11:13 +04:00
0afdf39dbc
New field added
2013-02-28 16:11:13 +04:00
62de22c142
External issue tracker params added to config
2013-02-28 16:10:01 +04:00
e6d2e56961
Issue tracker field added to projects
2013-02-28 16:10:00 +04:00
4243105eb5
deploys under git user
2013-02-20 17:11:41 -04:30
eefb27f5ae
Merge branch 'master' into fixes/api
...
Conflicts:
spec/requests/api/projects_spec.rb
2013-02-20 12:43:32 +01:00
bed500090e
Capistrano deployment example scripts
2013-02-20 00:13:18 -03:30
e049e18780
Merge pull request #2991 from raphendyr/username_change_disablation
...
Add option to disable username changing
2013-02-18 09:59:24 -08:00
fa3cc1dd24
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
2013-02-16 12:45:20 +00:00
b729728536
uppercase Gitlab version and revision constants. check api return gitlab version now
2013-02-16 14:42:22 +02:00
c8b92a4be2
Merge branch 'master' into fixes/api
2013-02-14 17:02:16 +01:00
ba65f2910b
Add option to disable username changing
...
This option allows to disable users from changing their username.
This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.
You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02:00
77a3bfe1de
Environments support added to Gitlab config
2013-02-14 11:44:34 +04:00
2ea12ff663
Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mikew-unicorn-app-dir-fix
...
Conflicts:
config/unicorn.rb.example
2013-02-13 15:11:26 +02:00
375caeefcf
Merge branch 'master' into fixes/api
2013-02-13 10:31:06 +01:00
449380265a
Merge branch 'master' into fixes/api
2013-02-12 10:17:57 +01:00
2d0c3e4c6d
Fix for incorrect routing to the Compare controller
2013-02-12 19:28:48 +11:00
a699ebdbcc
handle attahcment with send_file
2013-02-11 21:31:19 +02:00
d64090b8a9
No gitolite in project any more
2013-02-11 19:16:59 +02:00
7a88bf0978
Fix gitlab:check
2013-02-11 09:58:02 +02:00
8045a81bcf
Merge branch 'master' into fixes/api
2013-02-08 10:32:42 +01:00
Dmitriy Zaporozhets
Andrew8xx8
Andrew Kumanyaev
Kevin Lyda
Dan Knox
Sebastian Ziebell
Pierre GUINOISEAU
Sato Hiroyuki
wtw
mikew
Jaakko Kantojärvi
Yuri Feldman