71bd956866
email via sidekiq. start and stop rake tasks
2013-01-09 08:44:05 +03:00
c7bb3a1f72
sidekiq
2013-01-09 08:14:05 +03:00
aa97ff7fde
Fixed tree logs for branches with slash. Fixed remember of path when switch branch
2013-01-09 09:34:26 +02:00
b5f116f08b
Add a check whether repos_path is a symlink
2013-01-07 21:20:20 +01:00
e65731bb7e
Add concerns to autoload
2013-01-03 09:12:24 +02:00
ff976bc86c
fix grack accessing files beginning with .git
2012-12-31 23:33:00 +01:00
21e55ca318
added RAILS_RELATIVE_URL_ROOT support
2012-12-28 18:11:28 +00:00
3de4271846
Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298
2012-12-28 09:14:28 +02:00
c8bf5905bf
Fix form url and routes path
2012-12-26 20:31:18 +04:00
25c5763780
Add functional in user section
2012-12-26 19:52:15 +04:00
9c574464a6
Add functional in admin section
2012-12-26 19:52:15 +04:00
a1434ff50b
Fix shared Redis connection issue on Passenger
2012-12-25 23:14:00 +01:00
4c800342af
Fix routing by priority
2012-12-25 16:24:44 +02:00
3c1022f9b1
No resque errors
2012-12-25 16:18:22 +02:00
64db738f9d
Trying to fix resque issue
2012-12-25 15:53:50 +02:00
c8ba5c2d58
Fix routing issues when navigating over tree, commits etc
2012-12-25 06:14:05 +03:00
49e73f8ac1
Fixed syntax error in config -> settings
2012-12-24 21:29:53 +02:00
0dbb369ace
Cleanup deprecated configs
2012-12-24 21:25:33 +02:00
aec1a84042
Allow the OmniAuth provider args parameter to pass through as either an Array or a Hash.
2012-12-23 16:12:53 -08:00
0af5884bcd
gitlab.yml how to use section
2012-12-23 00:49:46 +02:00
d188adfd97
Changelog updated. Added warnings to username form
2012-12-20 21:16:42 +02:00
757c7a5291
Fix gravatar and ldap config
2012-12-20 16:54:28 +01:00
19eb637419
Update uses of Gitolite.config.foo settings
2012-12-20 16:54:28 +01:00
b2e46f44ce
Refactor Settings initializer
...
All overrides are marked as deprecated.
Default settings are at the bottom.
2012-12-20 16:54:28 +01:00
4496903950
Rename config options
2012-12-20 16:54:28 +01:00
2f7effe804
Refactor issues, Remove ajax
2012-12-19 06:14:05 +03:00
9ada678819
Split commit_id and noteable_id for Note
2012-12-18 20:02:00 +02:00
ca936d2784
Improve CI integration for merge requests
2012-12-11 06:14:05 +03:00
dfc5adfc23
Merge pull request #2188 from riyad/update-installation-docs
...
Update installation docs
2012-12-07 12:43:25 -08:00
0aa7f79ca4
allow customize gravatar url
2012-12-07 00:44:22 +04:00
d1e31bfce9
Remove generic database.yml.example
2012-12-05 17:38:54 +01:00
107a4e386a
Devise locale updated to stay consistent with GitLab
2012-12-04 19:19:26 +01:00
fddc0c29aa
add help page for gitlab specific rake tasks
2012-12-03 17:19:33 +01:00
46bf3a0949
Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax
2012-12-02 13:29:24 +02:00
0fbd9ac748
Remove SQLite support
2012-11-27 21:36:09 +01:00
e750efd9fc
Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests
...
Diff and patch for commits and merge requests
2012-11-26 04:40:49 -08:00
2b1afa0e62
Remove merge_request#raw and replace it with formats to #show
...
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
2012-11-25 00:05:44 +01:00
552b3105fb
Fixed admin area. Create project only from one place
2012-11-23 07:31:09 +03:00
2b683b0d0b
Ability to create project with namespace
2012-11-23 07:11:09 +03:00
26622f4c8f
Improve routing. Project access via namespace
2012-11-22 23:34:06 +03:00
8b4010397c
Register diff mime type
2012-11-22 20:22:44 +01:00
18bc873d53
Resque must be running in the own namespace
2012-11-20 18:59:37 +02:00
10d8b77b50
Clean old rails2 style code
2012-11-20 18:59:28 +02:00
406a0c809b
GitLabCi Service imtegration
2012-11-19 22:34:05 +03:00
20189f84ee
Update gems
2012-11-18 21:51:53 +01:00
527d223680
Update Rails config
2012-11-18 21:51:53 +01:00
1c5b2a5153
Stats page
2012-11-10 23:08:47 +02:00
f1ac2a616b
remove encode lib, clean all encoded area.
2012-11-09 01:41:07 +08:00
0d4568db78
gitolite custom config
2012-11-07 00:47:33 +02:00
f61ca97648
Add quiet_assets gem, remove initializer
2012-11-01 16:45:31 -04:00
bd50a9f466
grack: allow repositories to have dots in name, e.g. serverconfigs-example.com.git
2012-10-26 14:05:57 +02:00
fd0aca1225
Feature implemented
2012-10-24 14:20:53 +03:00
d75cc7eafd
Display https as repo clone indicator and prevent modification of web_protocol variable.
...
Rewrite build_url, use web_protocol for repo indicator.
Explicitly initialize custom port to make the logic obvious.
2012-10-21 15:48:34 +02:00
2ff36e74eb
Merge pull request #1564 from dosire/cookie_secure_setting
...
Secure and httponly options on cookie.
2012-10-21 06:14:36 -07:00
bd5dbe14e4
Merge branch 'web_editor'
2012-10-15 19:52:10 +03:00
8880c06d3b
disable annoying rails assets log messages
2012-10-14 00:02:01 +08:00
f6a8e69449
WebEditor: base form
2012-10-12 20:07:23 +03:00
16ceae895e
Separate observing of Note and MergeRequests
...
* Move is_assigned? and is_being_xx? methods to IssueCommonality
This is behavior merge requests have in common with issues. Moved
methods to IssueCommonality role. Put specs directly into
merge_request_spec because setup differs for issues and MRs
specifically in the "closed" factory to use.
* Add MergeRequestObserver. Parallels IssueObserver in almost every way.
Ripe for refactoring.
* Rename MailerObserver to NoteObserver
With merge request observing moved out of MailerObserver, all that
was left was Note logic. Renamed to NoteObserver, added tests and
updated application config for new observer names. Refactored
NoteObserver to use the note's author and not rely on current_user.
* Set current_user for MergeRequestObserver
IssueObserver and MergeRequestObserver are the only observers that
need a reference to the current_user that they cannot look up on
the objects they are observing.
2012-10-10 17:59:25 -04:00
75e6eb59ec
patch rails to ignore text limit
2012-10-10 13:17:48 +04:00
3e1d52f4b7
add default postgres config
2012-10-10 03:58:34 +04:00
d2ea858fbf
move emoji module to lib
2012-10-05 07:42:23 -07:00
72395d7f6e
no need to add fonts to assets path
2012-10-05 07:23:58 -07:00
317c928198
improve emoji checking performance
2012-10-05 07:23:58 -07:00
9e4f3147a0
specify HTTP verbs for match in routes
2012-10-05 07:23:57 -07:00
f963d37408
Merge pull request #1592 from jouve/devise_layout
...
make devise controllers use devise layout
2012-10-03 07:06:08 -07:00
224fb5770c
Added ability to manage groups from admin
2012-10-03 12:49:43 +03:00
1b6a3dfec9
Move all stuff to groups controller
2012-10-02 20:42:15 +03:00
d6363e9359
Admin Group scaffold -> new, show, index
2012-10-02 19:01:40 +03:00
236fd1e63b
all devise controller use devise layout
2012-09-29 13:06:53 +02:00
68f4b59738
Merge pull request #1569 from jouve/simplify_controllers2
...
Simplify controllers and layout handling
2012-09-27 12:53:01 -07:00
e563e948bb
Merge branch 'master' into simplify_controllers2
...
Conflicts:
app/controllers/commits_controller.rb
app/controllers/refs_controller.rb
2012-09-27 12:25:52 +02:00
a030e4b664
cleanup database.yml files
2012-09-27 02:56:20 -07:00
8432c9c176
Routes are now final
2012-09-26 16:45:00 -04:00
afc4a75499
Use Rails.root.join where appropriate
2012-09-26 16:32:26 -04:00
6cb626ef51
Add Compare#index and Compare#create actions
...
Create just redirects to our specially-formatted #show action
2012-09-26 16:32:24 -04:00
99d391332f
Add a "patch" MIME type, and render it like a normal view in Commit#show
2012-09-26 16:32:23 -04:00
c058e3903e
Finalize new routes
2012-09-26 16:32:23 -04:00
9d394250a8
Add an inflector to mark "commits" as uncountable
2012-09-26 16:32:23 -04:00
3574826920
Use Commits#show instead of Commits#index
...
Takes tree-ish + path as ID
2012-09-26 16:32:22 -04:00
169f16fb32
Remove Commits#compare, add CompareController
2012-09-26 16:32:22 -04:00
576cec6c67
Add BlobController, remove Refs#blob
2012-09-26 16:32:22 -04:00
39c6579306
Add BlameController, remove Refs#blame action
2012-09-26 16:32:22 -04:00
884eb73297
Enable tree resource, remove old tree routes
2012-09-26 16:32:21 -04:00
a21abce94f
Add tree-ish route placeholders, modify commit(s) routes
2012-09-26 16:32:20 -04:00
bdf317addc
layout selected by controller name
2012-09-26 22:27:44 +02:00
83efcabc82
set activerecord whitelist_attributes to true
2012-09-26 11:18:35 -07:00
a58d311262
Secure and httponly options on cookie.
2012-09-26 16:02:31 +02:00
c3907bef59
Merge pull request #1501 from caleywoods/master
...
Update timeout comment in unicorn example config.
2012-09-24 09:05:09 -07:00
6ddbee5d89
Consolidate all Resque-related initializers into "4_resque"
2012-09-22 11:26:22 -04:00
2cd0caaf73
Rename 4_resque_queues initializer to 4_resque
2012-09-22 11:20:04 -04:00
e3b149fae6
Update comment in example unicorn config
...
The timeout was changed to 30 and the comment wasn't updated. Also I've seen several reports of this timeout not being long enough for quite a few people. It resulted in me getting a 502 bad gateway from nginx until I upped it. Perhaps could back to the default 60 would be better? I changed mine to 300, running on an AWS micro instance.
2012-09-19 10:27:27 -05:00
259ca982da
Add docs for customizing Redis, add example file
2012-09-18 21:53:27 -04:00
bfed07ee20
Add an initializer to allow custom Resque configs
2012-09-18 21:45:09 -04:00
95bd93fe1a
Remove Projects#team action
...
Uses TeamMembers#index instead, to be more RESTful
2012-09-16 10:07:06 -04:00
d7eb797024
1.9 Hash syntax in routes.rb
...
Also cleans up some alignment and removes unnecessary "to: " arguments
2012-09-16 07:38:14 -04:00
94f91146f1
Limit admin/logs and admin/resque routes to the actions that are used
2012-09-16 07:38:14 -04:00
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
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
dc37c8aaae
Refactored profile area
2012-09-14 19:13:25 +03:00
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
acc5302c3f
improve profile layout after omniauth changes
2012-09-12 18:56:44 +03:00
048d47e626
Refactorn oauth & ldap
2012-09-12 09:23:16 +03:00
fa4150d47d
Cleanup after omniauth
2012-09-12 08:23:20 +03:00
486de8c3f4
Refactoring auth
2012-09-12 07:48:22 +03:00
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
ae9689f8ff
remove cucumber completely
2012-09-10 06:40:57 -07:00
6d6c7a17ea
Allow single-sign-on with Omniauth
2012-08-31 15:45:50 +02:00
a56cec1132
specify gitolite-admin owner in config
2012-08-29 02:08:39 +03:00
ad3a88cfd3
Prepared for gitolite v3
2012-08-29 02:03:04 +03:00
761c17f282
Unused routes removed
2012-09-05 09:20:02 +03:00
6817a6a295
add kaminari config with default and max per_page values
2012-09-03 04:22:49 -07:00
0de5d08e37
Give Resque route a name and use that for the iframe src
...
Closes #1350
2012-08-31 19:28:32 -04:00
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
05fa1f167c
Added hooks_path option example
2012-08-28 13:06:05 +02:00
c81d4ab4a9
Fixed some hardcoded paths
...
New config option: git_hooks_path
2012-08-28 10:57:23 +02:00
3c96d1f0e1
Send notification on update UserProject relation (access changed)
2012-08-27 00:32:03 +03:00
48443d20ca
Merge branch 'master' of git://github.com/gitlabhq/gitlabhq
2012-08-24 15:25:52 +02:00
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
74d65bb823
fix git push body bigger than 112k problem
2012-08-25 15:24:21 +08:00
3dd7703b80
Feature: Labels page. Index page
2012-08-24 13:05:40 +03:00
1ef1a4ae6e
Merge pull request #1239 from tsigo/disable_gravatar
...
Allow disabling Gravatars in gitlab.yml settings
2012-08-22 04:33:50 -07:00
aa50408ecb
1. Better message if no ssh key
...
2. SSH Keys Help page
2012-08-22 03:56:53 +03:00
2c128f3874
Remove rails-footnotes gem and its related files
2012-08-23 19:20:28 -04:00
b2b88b2ff2
Added font for head panel. Major restyle for header
2012-08-20 22:51:37 +03:00
c5ae1549a1
Adding default values for omniauth settings so tests don't failt
2012-08-17 16:32:22 +02:00
a64aff2f1c
Omniauth Support
2012-08-17 15:20:55 +02:00
65bcc41f3e
Allow disabling Gravatars in gitlab.yml settings
...
Closes #1237
2012-08-15 21:06:08 -04:00
91a8cd240b
Fix invalid syntax in OmniAuth initializer sample
2012-08-11 19:33:59 -04:00
5fd0e7ba11
Merge pull request #1198 from NARKOZ/preview_notes
...
ability to preview notes
2012-08-10 06:42:31 -07:00
9639780359
render notes preview on server-side
2012-08-09 23:47:48 -07:00
839757598b
Wiki pages page
2012-08-09 07:34:29 +03:00
34ba4e1352
Gitlab Markdown help page
2012-08-03 00:20:09 +03:00
00b280c3f9
Feature: Bulk Issues update
2012-07-28 03:35:43 +03:00
d9cd6269e9
System Hooks: move callback to observer
2012-07-20 01:01:29 +03:00
c38578428b
System Hooks: CRUD has done
2012-07-19 00:25:10 +03:00
1a2bacfb4b
Feature: ajax load for tree commit log
2012-07-10 22:52:38 +03:00
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
4dae41d5dc
Changes done as per feedback
2012-07-10 16:12:19 +02:00
12b34c8115
add: rake task to backup/restore gitlab db and repos
2012-07-10 00:01:05 +02:00
be1b40802d
Api page in help
2012-07-06 03:05:12 +03:00
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
6533711825
enable lockable strategy for users
2012-07-06 00:05:31 -07:00
2abd054b0c
update devise
2012-07-05 23:50:24 -07:00
d40b9ce26d
Admin gitolite logs. Refactored project creation. Few style fixes.
2012-07-05 21:59:37 +03:00
369df86e71
Remove GITLAB_OPTS, fixed ldap user creation
2012-07-05 21:29:37 +03:00
264ee0c5a1
Tabs styled. MR Get Patch
2012-07-05 01:26:23 +03:00
51f174b97f
fix port issue
2012-07-03 18:52:48 +03:00
00ef16a66c
Setting: Disable port if https
2012-07-03 18:34:47 +03:00
a2eda66b30
Disable issues sort. Recent issues on top. Fixed tests
2012-07-02 21:51:48 +03:00
e00390b377
fix 80 port config
2012-07-01 13:24:47 +03:00
Dmitriy Zaporozhets
Riyad Preukschas
Johannes Schleifenbaum
Chris Frohoff
Andrey Kumanyaev
Jakub Jirutka
Aaron Stone
Sergey Linnik
skarphet
Alexander Simonov
Saito
Valeriy Sizov
Robert Speicher
Markus Grobelin
Dmitriy Zaporozhets
Marin Jankovski
Robb Kidd
Nihad Abbasov
Cyril
Nihad Abbasov
Caley Woods
Tobias Pfeiffer
Florian Unglaub
Alex Denisov
LeonB
VonC
Stefan Morgenthaler