Robert Speicher
afc4a75499
Use Rails.root.join where appropriate
2012-09-26 16:32:26 -04:00
Robert Speicher
99d391332f
Add a "patch" MIME type, and render it like a normal view in Commit#show
2012-09-26 16:32:23 -04:00
Robert Speicher
9d394250a8
Add an inflector to mark "commits" as uncountable
2012-09-26 16:32:23 -04:00
Marin Jankovski
a58d311262
Secure and httponly options on cookie.
2012-09-26 16:02:31 +02:00
Robert Speicher
6ddbee5d89
Consolidate all Resque-related initializers into "4_resque"
2012-09-22 11:26:22 -04:00
Robert Speicher
2cd0caaf73
Rename 4_resque_queues initializer to 4_resque
2012-09-22 11:20:04 -04:00
Robert Speicher
bfed07ee20
Add an initializer to allow custom Resque configs
2012-09-18 21:45:09 -04:00
Robert Speicher
0d77209ea0
Be more resilient in the case of missing omniauth settings
...
Should no longer freak out when omniauth settings aren't present in
gitlab.yml. People who aren't using it shouldn't even have to put a
'false' entry in their config for it (and probably wouldn't, after an
upgrade).
2012-09-12 18:11:59 -04:00
Dmitriy Zaporozhets
486de8c3f4
Refactoring auth
2012-09-12 07:48:22 +03:00
Dmitriy Zaporozhets
621affecb5
Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
...
Conflicts:
Gemfile.lock
app/helpers/application_helper.rb
app/views/devise/sessions/new.html.erb
db/schema.rb
2012-09-12 06:49:52 +03:00
randx
a56cec1132
specify gitolite-admin owner in config
2012-08-29 02:08:39 +03:00
Nihad Abbasov
6817a6a295
add kaminari config with default and max per_page values
2012-09-03 04:22:49 -07:00
randx
7cdc5b9e04
Use similar interface to access gitolite
...
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
2012-08-29 00:04:06 +03:00
LeonB
c81d4ab4a9
Fixed some hardcoded paths
...
New config option: git_hooks_path
2012-08-28 10:57:23 +02:00
Florian Unglaub
48443d20ca
Merge branch 'master' of git://github.com/gitlabhq/gitlabhq
2012-08-24 15:25:52 +02:00
Dmitriy Zaporozhets
6e520d9cae
Merge pull request #1297 from SaitoWu/issues/1269
...
fix git push body bigger than 112k problem
2012-08-25 06:15:18 -07:00
Saito
74d65bb823
fix git push body bigger than 112k problem
2012-08-25 15:24:21 +08:00
Robert Speicher
2c128f3874
Remove rails-footnotes gem and its related files
2012-08-23 19:20:28 -04:00
Florian Unglaub
a64aff2f1c
Omniauth Support
2012-08-17 15:20:55 +02:00
Robert Speicher
65bcc41f3e
Allow disabling Gravatars in gitlab.yml settings
...
Closes #1237
2012-08-15 21:06:08 -04:00
Robert Speicher
91a8cd240b
Fix invalid syntax in OmniAuth initializer sample
2012-08-11 19:33:59 -04:00
VonC
2600e80b41
Look for 'gitolite_admin_uri' in the right section
...
of 'gitlab.yml'.
gitlabhq\config\initializers\1_settings.rb looks for
'gitolite_admin_uri' in the 'git' section of 'gitlab.yml'
Actually, that setting is in the 'git_host' section.
If not fixed, the 'gitolite_admin_uri' would always be equals to
'git@localhost:gitolite-admin', even if the administrator wants
to have another user than 'git' in charge of that repo.
2012-07-11 16:37:34 +02:00
Stefan Morgenthaler
4dae41d5dc
Changes done as per feedback
2012-07-10 16:12:19 +02:00
Dmitriy Zaporozhets
4c24cabf47
Merge pull request #1012 from NARKOZ/devise
...
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
2012-07-06 08:18:18 -07:00
Nihad Abbasov
6533711825
enable lockable strategy for users
2012-07-06 00:05:31 -07:00
Nihad Abbasov
2abd054b0c
update devise
2012-07-05 23:50:24 -07:00
randx
369df86e71
Remove GITLAB_OPTS, fixed ldap user creation
2012-07-05 21:29:37 +03:00
Dmitriy Zaporozhets
51f174b97f
fix port issue
2012-07-03 18:52:48 +03:00
Dmitriy Zaporozhets
00ef16a66c
Setting: Disable port if https
2012-07-03 18:34:47 +03:00
Dmitriy Zaporozhets
a2eda66b30
Disable issues sort. Recent issues on top. Fixed tests
2012-07-02 21:51:48 +03:00
randx
e00390b377
fix 80 port config
2012-07-01 13:24:47 +03:00
randx
ec1b1588ee
Improved header font
2012-07-01 13:11:17 +03:00
randx
1d543e6430
Finished with configs
2012-07-02 21:59:48 +03:00
Dmitriy Zaporozhets
9b337b8328
Epic: Gitlab configuration with default values
2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets
15a03e1d87
Merge pull request #1023 from SaitoWu/feature/https
...
Feature/https
2012-07-02 01:52:23 -07:00
Saito
401340168c
bypass gitolite update hook, and set an GL_USER variable.
2012-07-02 16:44:45 +08:00
randx
6a58deb536
UI changes:
...
* .page_title class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page
Backend changes:
* Gitab::Version && Gitlab::Revision constants
2012-07-01 00:35:24 +03:00
Dmitriy Zaporozhets
fca957086e
Merge pull request #1020 from SaitoWu/feature/https
...
Feature/https
2012-06-29 06:44:45 -07:00
Saito
aefe4dc3a2
fix a npe, and need a patch for path_info
2012-06-29 21:40:23 +08:00
Dmitriy Zaporozhets
f73d71810e
Merge pull request #1018 from glebm/master
...
Resque Authentication + iFrame view
2012-06-29 04:53:43 -07:00
gleb
2da45e9cbf
Refs #1013
...
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
2012-06-29 13:46:24 +02:00
Dmitriy Zaporozhets
cfee2fc9e4
Merge pull request #1011 from peikk0/config_projects_limit
...
Add configurable default for projects_limit
2012-06-29 04:23:25 -07:00
Pierre GUINOISEAU
97d74c2adc
Add configurable default for projects_limit
2012-06-29 12:57:33 +02:00
Saito
8db947bcfe
implements protected branches to smart http protocal
2012-06-29 18:11:37 +08:00
Saito
7f44599ed0
integrate with gitlabhq authority
2012-06-29 15:43:15 +08:00
Saito
86807b8ecc
mount grack to git, u can 'git clone http://localhost/git/xx.git ' now
2012-06-29 11:30:31 +08:00
randx
55f8338502
Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer
2012-06-24 09:33:22 +03:00
randx
68389588d6
Force resque protection
2012-06-22 23:46:57 +03:00
randx
ed247b3893
resque auth example
2012-06-21 17:23:51 +03:00
Robb Kidd
5303cc285a
Add resque_spec to test queuing mail.
2012-06-20 14:09:46 -04:00
Dmitriy Zaporozhets
3a2d7a6604
Merge pull request #917 from teaminsight/queue_fix
...
Connection fix for resque worker
2012-06-11 14:04:33 -07:00
jcredding
294dfe15ca
added connection fix initializer, helps long running resque workers not fail
2012-06-11 15:58:58 -05:00
Saito
c62715acc9
now render the correct authorname and message
2012-05-30 12:11:03 +08:00
Saito
c71a76e71a
fix graph problem if authorname or message isnot utf8 encoding
2012-05-30 11:47:26 +08:00
Saito
e1d1673e74
monkey patch grit to support utf8 encoding
2012-05-29 16:17:31 +08:00
randx
3272620f72
lib/ refactoring. Module Gitlabhq renamed to Gitlab
2012-05-26 13:37:49 +03:00
Dmitriy Zaporozhets
9c76bd9540
Project linguist integration
2012-04-21 01:26:22 +03:00
Arthur Schreiber
5b6019f357
Using github's linguist to better detect filetypes and to do syntax highlighting.
2012-04-20 23:21:12 +02:00
Dmitriy Zaporozhets
b7558a2063
Removed encoding monkey patch
2012-04-11 23:03:56 +03:00
Dmitriy Zaporozhets
b612497903
Fixed devise email_from, reordered initalizers
2012-04-06 01:28:37 +03:00
Dmitriy Zaporozhets
6e2a6d925f
cleanup after prev commit
2012-04-05 01:58:23 +03:00
Dmitriy Zaporozhets
80ddd2c09d
Better encoding handling. Updated grit
2012-04-05 01:51:49 +03:00
Valeriy Sizov
27cd6c758d
Merge pull request #585 from patthoyts/pt/omniauth-config
...
Move OmniAuth configuration details into a non-revision controlled file.
2012-03-27 13:13:07 -07:00
Ariejan de Vroom
474a42cfbd
Only load MySQL2Adapter connection fix is MySQL2 is available.
...
Useful for Sqlite or Postgres installations.
2012-03-27 16:59:25 +03:00
Yvan
2519ecf686
Changed for mysql2 adapter
2012-03-27 16:42:23 +03:00
Ariejan de Vroom
3b4e7b315b
Added fix for "MySQL has gone away" errors with Resque workers.
2012-03-27 15:17:23 +02:00
Pat Thoyts
6e27350aac
Move OmniAuth configuration details into a non-revision controlled file.
...
Provide an omniauth.rb.sample file to avoid encouraging end-users to commit
their provider access details (passwords or api tokens) into their git
repositories.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-03-23 15:35:55 +00:00
Dmitriy Zaporozhets
770f18ac50
Prevent Application from crash cause of charloc_cholmes error
2012-03-02 19:42:28 +03:00
Saito
adcfeae161
Merge branch 'issue-331'
2012-02-10 10:59:32 +08:00
Valery Sizov
c083df0570
LDAP BASE IMPLEMENRTATION
2012-01-28 13:11:21 +03:00
Ariejan de Vroom
9696dff6e2
Added initializer to force Resque to wath the post_receive queue
2012-01-23 09:46:59 +01:00
Saito
ca23f27b5b
upload file's name support non-english words
2012-01-16 14:36:30 +08:00
Saito
98b5c3647b
use monkey patch to trancoding content
2011-12-30 22:26:13 +08:00
Dmitriy Zaporozhets
cff9519127
Dashboard perfomance improved. Filter for projects page
2011-12-20 08:24:14 +02:00
Dmitriy Zaporozhets
9e089efe5a
gitolite & gitosis support
2011-12-04 01:44:59 +02:00
Dmitriy Zaporozhets
a031813887
Commit, network graph refactoring
2011-11-27 17:35:49 +02:00
Dmitriy Zaporozhets
367c4f42f0
one config file, git options added
2011-11-25 22:18:36 +02:00
Valery Sizov
d61268e4f1
[ #169 ] – Move email 'from' & 'host' settings to config file
2011-11-22 23:36:14 +02:00
Nihad Abbasov
003bf61258
add auth token for users
2011-11-15 11:08:05 +04:00
Nihad Abbasov
d62200cad4
clean-up code
...
* Remove trailing whitespace
* Converts hard-tabs into two-space soft-tabs
* Remove consecutive blank lines
2011-10-26 18:46:25 +05:00
gitlabhq
5baa5fad0a
Issue #149
2011-10-24 22:38:03 +03:00
gitlabhq
b3279b9b51
moved from albino -> pygments.rb
2011-10-22 14:08:03 +03:00
gitlabhq
c463eeb090
refactoring
2011-10-20 22:00:00 +03:00
VSizov
dd833d28ad
Sortable issues
2011-10-15 19:56:53 +03:00
gitlabhq
9ba1224867
init commit
2011-10-09 00:36:38 +03:00