Robert Speicher
4f4c401f77
Don't instantiate Resque::Server in routes
...
It still works, and it cleans up the output of `rake routes`.
2012-09-16 07:38:14 -04:00
Tobias Pfeiffer
74cfab692f
Renamed unicorn.rb.orig to unicorn.rb.example since this seems to be more in line with the common used naming in the config directory. Plus seeing *.orig files I think of the leftovers of git merges, which left me puzzled for quite some time.
2012-09-15 20:26:08 +02:00
Dmitriy Zaporozhets
dc37c8aaae
Refactored profile area
2012-09-14 19:13:25 +03: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
randx
acc5302c3f
improve profile layout after omniauth changes
2012-09-12 18:56:44 +03:00
Dmitriy Zaporozhets
048d47e626
Refactorn oauth & ldap
2012-09-12 09:23:16 +03:00
Dmitriy Zaporozhets
fa4150d47d
Cleanup after omniauth
2012-09-12 08:23:20 +03: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
Nihad Abbasov
ae9689f8ff
remove cucumber completely
2012-09-10 06:40:57 -07:00
Florian Unglaub
6d6c7a17ea
Allow single-sign-on with Omniauth
2012-08-31 15:45:50 +02:00
randx
a56cec1132
specify gitolite-admin owner in config
2012-08-29 02:08:39 +03:00
randx
ad3a88cfd3
Prepared for gitolite v3
2012-08-29 02:03:04 +03:00
Alex Denisov
761c17f282
Unused routes removed
2012-09-05 09:20:02 +03:00
Nihad Abbasov
6817a6a295
add kaminari config with default and max per_page values
2012-09-03 04:22:49 -07:00
Robert Speicher
0de5d08e37
Give Resque route a name and use that for the iframe src
...
Closes #1350
2012-08-31 19:28:32 -04: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
05fa1f167c
Added hooks_path option example
2012-08-28 13:06:05 +02:00
LeonB
c81d4ab4a9
Fixed some hardcoded paths
...
New config option: git_hooks_path
2012-08-28 10:57:23 +02:00
Alex Denisov
3c96d1f0e1
Send notification on update UserProject relation (access changed)
2012-08-27 00:32:03 +03: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
randx
3dd7703b80
Feature: Labels page. Index page
2012-08-24 13:05:40 +03:00
Dmitriy Zaporozhets
1ef1a4ae6e
Merge pull request #1239 from tsigo/disable_gravatar
...
Allow disabling Gravatars in gitlab.yml settings
2012-08-22 04:33:50 -07:00
Dmitriy Zaporozhets
aa50408ecb
1. Better message if no ssh key
...
2. SSH Keys Help page
2012-08-22 03:56:53 +03:00
Robert Speicher
2c128f3874
Remove rails-footnotes gem and its related files
2012-08-23 19:20:28 -04:00
randx
b2b88b2ff2
Added font for head panel. Major restyle for header
2012-08-20 22:51:37 +03:00
Florian Unglaub
c5ae1549a1
Adding default values for omniauth settings so tests don't failt
2012-08-17 16:32:22 +02: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
Dmitriy Zaporozhets
5fd0e7ba11
Merge pull request #1198 from NARKOZ/preview_notes
...
ability to preview notes
2012-08-10 06:42:31 -07:00
Nihad Abbasov
9639780359
render notes preview on server-side
2012-08-09 23:47:48 -07:00
Dmitriy Zaporozhets
839757598b
Wiki pages page
2012-08-09 07:34:29 +03:00
randx
34ba4e1352
Gitlab Markdown help page
2012-08-03 00:20:09 +03:00
randx
00b280c3f9
Feature: Bulk Issues update
2012-07-28 03:35:43 +03:00
Valeriy Sizov
d9cd6269e9
System Hooks: move callback to observer
2012-07-20 01:01:29 +03:00
Valeriy Sizov
c38578428b
System Hooks: CRUD has done
2012-07-19 00:25:10 +03:00
randx
1a2bacfb4b
Feature: ajax load for tree commit log
2012-07-10 22:52:38 +03: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
Stefan Morgenthaler
12b34c8115
add: rake task to backup/restore gitlab db and repos
2012-07-10 00:01:05 +02:00
randx
be1b40802d
Api page in help
2012-07-06 03:05:12 +03: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
Dmitriy Zaporozhets
d40b9ce26d
Admin gitolite logs. Refactored project creation. Few style fixes.
2012-07-05 21:59:37 +03:00
randx
369df86e71
Remove GITLAB_OPTS, fixed ldap user creation
2012-07-05 21:29:37 +03:00
randx
264ee0c5a1
Tabs styled. MR Get Patch
2012-07-05 01:26:23 +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
Saito
82e2551833
dot needs a escape.
2012-07-02 11:07:21 +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
Saito
7888e3ae29
now works with git clone http://localhost/repo.git now
2012-06-29 21:39:40 +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
Dmitriy Zaporozhets
318350e34f
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq
...
Conflicts:
Gemfile.lock
2012-06-29 14:25:20 +03: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
Nihad Abbasov
4aca61e8a6
install grape and mount Gitlab::API
2012-06-28 03:42:58 -07:00
randx
335f9d6410
New Feature: Diff patch file export for commit
2012-06-28 12:51:50 +03: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
Nihad Abbasov
a21bda5ac9
load assets group to allow lazy compilation in production
2012-06-22 03:09:36 -07:00
randx
ed247b3893
resque auth example
2012-06-21 17:23:51 +03:00
Robb Kidd
88964132ed
Extract observation of User to a UserObserver
2012-06-20 14:09:46 -04:00
Robb Kidd
5303cc285a
Add resque_spec to test queuing mail.
2012-06-20 14:09:46 -04:00
Robb Kidd
6617eaaf9b
Make IssueObserver handle issus, not MailerObserver
2012-06-20 14:09:46 -04:00
Dmitriy Zaporozhets
5bbf3ccf05
Cucumber:
...
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits
2012-06-15 07:15:28 +03:00
Nihad Abbasov
d1953a2640
no need to extend assets path anymore
...
see 865cf830c4
2012-06-13 05:19:02 -07:00
Dmitriy Zaporozhets
a243253b10
Refactored project archive. Improved MR usability form
2012-06-13 09:03:53 +03:00
randx
edd81a79c5
Dashboard refactoring:
...
* dashboard should be in dashboard controller not project index
* projects index removed
2012-06-12 23:13:42 +03:00
randx
093159a868
Styled snippets. Raw button for snippet
2012-06-12 21:41:46 +03: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
James Earl Douglas
fd99863565
fix typo: congiguration
2012-06-08 16:24:33 -07: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
8ceb94081a
[Travis] try run both db
2012-05-25 16:38:23 +03:00
Dmitriy Zaporozhets
1e4d15b406
Password & token split up, icon to button for top panel
2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
9cd8f7b082
New Feature: Git Blame for file
2012-05-17 19:11:45 +03:00
Dmitriy Zaporozhets
28cb43135c
Hooks UI improved, Request tests added
2012-04-26 20:43:12 +03:00
Dmitriy Zaporozhets
08994f3f60
Merge remote-tracking branch 'origin/merge_button'
...
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
2012-04-21 12:22:56 +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
randx
35e21b3402
Admin dashboard
2012-04-20 19:41:49 +03:00
Dmitriy Zaporozhets
c9def945d4
User blocking improved. Admin area styled
2012-04-16 23:33:03 +03:00
Valery Sizov
8269a3a735
Auto-merge: checking via AJAX
2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets
95fde9bd7a
Projects page as dashboard. Old dashboard removed
2012-04-14 11:20:45 +03:00
Dmitriy Zaporozhets
b7558a2063
Removed encoding monkey patch
2012-04-11 23:03:56 +03:00
Dmitriy Zaporozhets
23d950855d
Milestone basic scaffold
2012-04-09 00:28:58 +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
Abe Voelker
6aabf1157a
Move Unicorn unix socket out of /tmp
2012-04-01 14:44:12 -05:00
Dmitriy Zaporozhets
25924a9089
Email link https support
2012-03-31 15:59:06 +03:00
randx
78d620b3b6
Raw gitlab automerge feature
2012-03-29 18:03:05 +03:00
randx
69ef81404c
UI improved, .main_box css class for show pages
2012-03-28 10:46:51 +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
724ea16c34
Activities page added. Dashboard few specs. Preparing for 2.3
2012-03-19 22:52:16 +02:00
Dmitriy Zaporozhets
5d2bd5ec3a
Simple search implementation
2012-03-16 01:14:39 +02:00
Dmitriy Zaporozhets
3676838dc9
Rspec test repo replaced.\nMerge Requests improved
2012-03-13 23:54:49 +02:00
Valery Sizov
529282d9de
unicorn: fix path to pid file
2012-03-11 17:49:09 +02:00
Valery Sizov
10887927af
added example config for unicorn
2012-03-10 16:57:43 +02:00
Dmitriy Zaporozhets
04e9022e5a
sqlite config example
2012-03-07 21:23:09 +02:00
Dmitriy Zaporozhets
55e72f4cdf
Gitlab moved to mysql
2012-03-06 19:54:59 +02:00
Dmitriy Zaporozhets
0727edd8a0
Removed issues,mr delete buttons. Refactored models
2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets
770f18ac50
Prevent Application from crash cause of charloc_cholmes error
2012-03-02 19:42:28 +03:00
Dmitriy Zaporozhets
0a0710a548
Event entity created
...
Observe issue, merge request, note creation - create event
register push event
2012-02-29 11:15:58 +02:00
Dmitriy Zaporozhets
376bec26de
Added dashboard page. Projects page not root from now
2012-02-28 22:59:36 +02:00
Dmitriy Zaporozhets
215a01f63c
move notes login to one controller
2012-02-24 09:16:06 +02:00
vsizov
bdc42488e9
wiki is done
2012-02-20 20:16:55 +03:00
Valery Sizov
85974948e7
Wiki: history
2012-02-19 21:52:05 +02:00
Valery Sizov
4c1b8558df
Wiki: base implemetation logic
2012-02-19 19:50:13 +02:00
Valery Sizov
eacea15a21
wiki base sceleton
2012-02-19 19:50:13 +02:00
Dmitriy Zaporozhets
9edbac5ac8
Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
...
Conflicts:
.gitignore
2012-02-19 11:39:28 +02:00
Dmitriy Zaporozhets
dac7c44ab3
Updated readme, Roles in progress
2012-02-15 23:51:04 +02:00
Dmitriy Zaporozhets
37224dc9c1
ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only
2012-02-15 22:02:33 +02:00
Dmitriy Zaporozhets
8d493019c4
Show commits for merge request immediatly
2012-02-15 01:15:02 +02:00
Dmitriy Zaporozhets
bc3735004c
Moving to rails 3.2
2012-02-11 20:34:25 +02:00
Dmitriy Zaporozhets
cc043f32d8
Admin area improved
2012-02-11 19:56:18 +02:00
Saito
adcfeae161
Merge branch 'issue-331'
2012-02-10 10:59:32 +08:00
Dmitriy Zaporozhets
4d89322d67
Snippets - fixed after bootstrap
...
Project - restyled show page, removed info page
Repository - restyled show page, added download option
Tags - added download options
2012-02-08 01:00:49 +02:00
Dmitriy Zaporozhets
422e43989b
Compare view for commits
2012-02-06 22:32:04 +02:00
Dmitriy Zaporozhets
8ebfae9a07
Merge branch 'bootstrap'
...
Conflicts:
Gemfile
app/views/commits/_commits.html.haml
app/views/projects/empty.html.haml
2012-01-30 00:45:35 +02:00
Dmitriy Zaporozhets
0a4222fb98
Bootstrap: Activities
2012-01-28 16:47:55 +02:00
vsizov
d6a0b8f428
LDAP done
2012-01-28 16:23:17 +03:00
Valery Sizov
c083df0570
LDAP BASE IMPLEMENRTATION
2012-01-28 13:11:21 +03:00
Dmitriy Zaporozhets
5c6417ce07
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-01-23 20:38:10 +02:00
Ariejan de Vroom
9696dff6e2
Added initializer to force Resque to wath the post_receive queue
2012-01-23 09:46:59 +01:00
Dmitriy Zaporozhets
7157305d5e
cleaning dashboard & tags
2012-01-23 09:54:47 +02:00