Dmitriy Zaporozhets
39ba934c0a
REpostiry, Team models
2013-01-03 21:09:18 +02:00
Koen Punt
6b9177ca02
replaced system() calls with FileUtils.* method
...
This also makes that 'mv: cannot stat `/ho..' is not shown in the test :)
consistent spacing
require fileutils
Revert "require fileutils"
This reverts commit 54313d3bbaa60cfc5b405be50cc00b7f6b0cb715.
new hash notation
FileUtils.mv in begin/rescue block
2013-01-03 15:36:50 +01:00
Dmitriy Zaporozhets
da03a5c7e2
more refactoring using models/concerns
2013-01-03 09:06:07 +02:00
Dmitriy Zaporozhets
cac7723451
Get rid of roles
2013-01-02 23:35:11 +02:00
Dmitriy Zaporozhets
1b25a8f437
Improve Extract path
2013-01-02 22:39:02 +02:00
Jakob Borg
0f07922f19
'namespace' should be exposed via the API
...
Since it's now an integral part of the project name, it should be
visible via the API.
2013-01-02 21:31:20 +01:00
Dmitriy Zaporozhets
67896ea9a2
Fixed missing current user for issue observer
2013-01-02 20:25:25 +02:00
Dmitriy Zaporozhets
d431e43392
Fix few bugs and tests after refactoring ownership logic
2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets
e5ff5c2869
Use project with namespace in email subject
2012-12-31 18:22:44 +02:00
Dmitriy Zaporozhets
30d6370719
Add subdir support for rewrite-hooks script
2012-12-31 17:46:40 +02:00
Dmitriy Zaporozhets
8392449599
Fix backup/restore of repos
2012-12-31 12:01:05 +02:00
Kevin Lamontagne
c816dcc105
Don't setuid the repositories (Rake checks)
2012-12-30 21:46:28 -05:00
Dmitriy Zaporozhets
96d49bf04c
Use sdoc to generate application code documentation
2012-12-30 14:43:00 +02:00
Chris Frohoff
21e55ca318
added RAILS_RELATIVE_URL_ROOT support
2012-12-28 18:11:28 +00:00
Dmitriy Zaporozhets
d03964d6ec
Fixed and improved enable_naamespace migration task
2012-12-28 06:14:05 +03:00
Dmitriy Zaporozhets
1f3bdd453e
Allow spaces in project name
2012-12-28 09:29:57 +02:00
Dmitriy Zaporozhets
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
Dmitriy Zaporozhets
4cbb29cfad
Fix not_in_project scope. Added counters in admin -> users. Improved seeds
2012-12-27 06:14:05 +03:00
Andrey Kumanyaev
17ea019f4e
Add Project name validation
2012-12-26 19:52:15 +04:00
Valeriy Sizov
c4536ae587
Merge pull request #2376 from sriharshav/fixed
...
Fix replace return with next in rake rask
2012-12-26 05:02:56 -08:00
Dmitriy Zaporozhets
5cd823847b
Use gitlab resque fork. Added rake task to stop all workers
2012-12-26 11:23:43 +02:00
Dmitriy Zaporozhets
64db738f9d
Trying to fix resque issue
2012-12-25 15:53:50 +02:00
Sriharsha Vardhan
d41aac629b
Fix replace return with next in rake rask
2012-12-25 12:13:50 +05:30
Dmitriy Zaporozhets
c5eba169cd
Cleanup service tasks
2012-12-25 07:14:05 +03:00
Dmitriy Zaporozhets
c8ba5c2d58
Fix routing issues when navigating over tree, commits etc
2012-12-25 06:14:05 +03:00
Dmitriy Zaporozhets
a87fccc083
Update projects in gitolite after namespace moved. Added rake task to cleanup garbage from gitolite
2012-12-24 20:02:08 +02:00
Riyad Preukschas
dea8628171
Merge branch 'stable'
2012-12-24 16:48:32 +01:00
Riyad Preukschas
8ef7b9b6d1
Make SQLite check in gitlab:check more robust
2012-12-24 16:45:10 +01:00
Riyad Preukschas
0e15270b75
Fix crash in gitlab:check while checking hooks
2012-12-24 16:45:08 +01:00
Riyad Preukschas
d9ca1bce7a
Fix paths in gitlab:check
2012-12-24 16:45:03 +01:00
Riyad Preukschas
2462949fd5
Update output of gitlab:gitolite:update_*
2012-12-23 21:16:26 +01:00
Riyad Preukschas
31e0fa6572
Update output of gitlab:enable_namespaces
2012-12-23 21:16:08 +01:00
Riyad Preukschas
1b6c28b976
Update output of gitlab:backup:resore
2012-12-23 21:15:25 +01:00
Riyad Preukschas
430d3ad45b
Update output of gitlab:enable_automerge
2012-12-23 21:14:30 +01:00
Riyad Preukschas
224da71177
Extract task helper methods
2012-12-23 21:13:57 +01:00
Riyad Preukschas
9655350c79
Fix check.rake
2012-12-23 21:13:57 +01:00
Riyad Preukschas
ece30f53ee
Merge branch 'stable'
2012-12-23 20:58:01 +01:00
Riyad Preukschas
a9e2fa4c35
Fix output of gitlab:check
2012-12-23 20:51:27 +01:00
Riyad Preukschas
3bf0b4e25b
Fix satellite check for projects with empty repo
...
Fixes #2349
2012-12-23 20:51:27 +01:00
Dmitriy Zaporozhets
a5d7a95893
Merge pull request #2260 from hiroponz/improve-network-graph
...
Improve network-graph
2012-12-23 10:24:43 -08:00
Riyad Preukschas
db2c15369c
Merge branch 'master' into discussions
...
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
2012-12-23 01:03:57 +01:00
Dmitriy Zaporozhets
60038a99ca
Import: Skip if not git repo
2012-12-23 00:18:39 +02:00
Dmitriy Zaporozhets
fa8f834374
Fix import rake task and tests
2012-12-23 00:15:48 +02:00
Dmitriy Zaporozhets
328e0d80ca
Log if satellite creation failed
2012-12-22 23:45:22 +02:00
Riyad Preukschas
056fa05b86
Remove path parameter from projects API
2012-12-22 20:06:18 +01:00
Dmitriy Zaporozhets
988e6ac205
Fix #2220
2012-12-22 14:34:38 +02:00
Dmitriy Zaporozhets
2398af9ab0
Fixed wierd gitlab markdown issue
2012-12-22 14:18:40 +02:00
Dmitriy Zaporozhets
cec866a7ce
Improve wiki rendering. Fix pygemnt + markdown invalid html
2012-12-22 13:01:15 +02:00
Riyad Preukschas
eaa99478a7
Up API version to v3
2012-12-21 18:55:39 +01:00
Riyad Preukschas
8f01190eb5
Remove all references tp the project code parameter from the API
2012-12-21 18:47:04 +01:00
Riyad Preukschas
931ec399bd
Remove the code parameter from the projects API
2012-12-21 18:43:46 +01:00
Dmitriy Zaporozhets
a47032bc29
Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
...
Conflicts:
vendor/assets/javascripts/branch-graph.js
2012-12-21 13:07:34 +02:00
Dmitriy Zaporozhets
a567d596f8
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
...
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
Riyad Preukschas
1acff973c8
Rename add_user_to_project_teams to gitlab:import:user_to_projects
...
Rename add_users_to_project_teams to gitlab:import:all_users_to_all_projects
2012-12-20 21:52:37 +01:00
Riyad Preukschas
c9bf2bb288
Rename gitlab:app:backup_* to gitlab:backup:*
...
Rename gitlab:app:db_* to gitlab:backup:db:*
Rename gitlab:app:repo_* to gitlab:backup:repo:*
Rename *_dump to *_create
2012-12-20 21:52:35 +01:00
Riyad Preukschas
56f9a674a6
Add gitlab:satellites:create as an alias for gitlab:enable_automerge
2012-12-20 21:52:26 +01:00
Riyad Preukschas
501f048846
Rename gitlab:app:enable_automerge to gitlab:enable_automerge
2012-12-20 20:22:25 +01:00
Riyad Preukschas
e3a7e43ff4
Rename gitlab:activate_namespaces to gitlab:enable_namespaces
2012-12-20 20:22:25 +01:00
Valeriy Sizov
77d632890b
refactoring gfm_autocomplete
2012-12-20 20:52:12 +02:00
Riyad Preukschas
4c8ac320dd
Updated gitlab:check task
2012-12-20 16:54:28 +01:00
Riyad Preukschas
19eb637419
Update uses of Gitolite.config.foo settings
2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets
4b02f4a22d
show production.log, show only active milestone for issue filter
2012-12-19 07:14:05 +03:00
Boyan Tabakov
e954438a1d
Extended users API to support updating and deleting users.
...
Also added tests.
2012-12-18 21:24:31 +02:00
Dmitriy Zaporozhets
4ea9b3331f
Change travis rake task
2012-12-19 19:44:15 +02:00
Riyad Preukschas
d2be7577c1
Merge pull request #2243 from jouve/fix_gfm_username_autocomplete
...
fix gfm autocomplete for usernames
2012-12-14 13:56:06 -08:00
Riyad Preukschas
645afc384a
Display namespace for projects in gitlab:check task.
2012-12-14 21:13:07 +01:00
Riyad Preukschas
69c18903e7
Update gitlab:check task to use the Gitlab.config.ssh_user setting
2012-12-14 20:22:34 +01:00
Riyad Preukschas
c3b9774f4b
Update and add checks
2012-12-13 12:11:41 +01:00
Riyad Preukschas
71266ad28f
Split and renamed check tasks
2012-12-13 12:09:48 +01:00
Riyad Preukschas
0236b3d17e
Rename status rake task to check
2012-12-13 12:09:48 +01:00
Sato Hiroyuki
5fd830f01c
Improve network-graph
2012-12-13 10:10:10 +09:00
Cyril
d3b8952f8f
Add username to User and UserBasic entities in API and in examples in doc.
2012-12-12 18:51:20 +01:00
Cyril
63d9373aa8
Validates presence of User#name
...
The 2 reasons are :
- creation of user fail if name is empty : in after_save, it tries to create a
namespace with namespace.name = user.name and namespece validates presence
Namespace#name
- in the web app links to team members are broken with empty User#name because
they are of the form <a href'...'> user.name </a>
2012-12-12 17:53:43 +01:00
Dmitriy Zaporozhets
e9bef9c007
Merge pull request #2258 from jasl8r/issue-2193-grack-read-only-access
...
Support read-only access for git over HTTP
2012-12-12 04:16:39 -08:00
Dmitriy Zaporozhets
439d03bbed
Fix namespace api autocomplete
2012-12-12 12:54:28 +02:00
Jeremy Slater
6cf5d7c96d
Support read-only access for git over HTTP
2012-12-11 15:28:40 -05:00
Dmitriy Zaporozhets
59a86e4229
Fix resque exception
2012-12-11 18:46:58 +02:00
Riyad Preukschas
9f940aeaf4
Fix detecting Ruby version and Omniauth providers in gitlab:env:info task
...
Fixes #2245
2012-12-10 22:53:33 +01:00
Dmitriy Zaporozhets
80e984ee5e
Fix project lookup in post receive
2012-12-08 20:48:33 +02:00
Koen Punt
4b2ecbc420
Updated branch-graph, abstracted some code in seperate functions
...
Removed unused Raphael.fn.popup
2012-12-07 22:05:17 +01:00
Koen Punt
e1282d507f
BranchGraph now loads async
...
Centralized keyboard and drag events for BranchGraph
2012-12-07 19:06:46 +01:00
Riyad Preukschas
12b4bb5946
Make gitlab:env:info task more robust
...
Closes #2213
2012-12-07 16:42:09 +01:00
Cyril
045b4c8fcd
replace user.name by user.username in GFM
2012-12-07 04:46:29 +01:00
Riyad Preukschas
23a8e59938
Improve gitlab:env:info task
...
Renamed from gitlab:app:info
Add several extra info points
2012-12-06 21:16:48 +01:00
Jon Evans
32d9c223a5
Spelling fix to rake info task
2012-12-06 14:10:42 -05:00
Johannes Schleifenbaum
b39aba73d5
add rake task to gather system information
2012-12-05 22:06:47 +01:00
Riyad Preukschas
534bd5a268
Fix emoji generation and styling
2012-12-03 22:51:56 +01:00
Nihad Abbasov
270a43370a
API: get a single wall note
2012-12-01 02:20:45 -08:00
Nihad Abbasov
42ef89c98a
API: expose created date for project hooks and user SSH keys
2012-12-01 02:04:44 -08:00
Nihad Abbasov
968c09ae91
API version returns last version set
...
* fixed in grape v0.2.2
2012-12-01 02:03:51 -08:00
Dmitriy Zaporozhets
10ec9b2293
Merge pull request #2017 from duksis/backup_restore
...
bugfix: backup data retrieved with the same type keys as saved
2012-11-30 12:48:27 -08:00
Nihad Abbasov
ee6187bd55
API: ability to create a wall note
2012-11-29 15:52:56 -08:00
Nihad Abbasov
2a98a060ca
API: don't expose 'updated_at' for notes
2012-11-29 14:41:24 -08:00
Nihad Abbasov
961cb285b0
API: restore broken merge request commenting
2012-11-29 12:11:01 -08:00
Nihad Abbasov
c946bf886c
API: create new notes
2012-11-29 12:11:00 -08:00
Nihad Abbasov
1c5aa848ce
API: get a single note
2012-11-29 12:11:00 -08:00
Nihad Abbasov
9a4974b760
correct example
2012-11-29 12:11:00 -08:00
Nihad Abbasov
01eab583d0
API: list wall, snippet and issue notes
2012-11-29 12:11:00 -08:00
Dmitriy Zaporozhets
ff9a2e2a93
Improve admin logs
2012-11-29 07:49:11 +03:00
Dmitriy Zaporozhets
df03275eaa
Merge pull request #1655 from zzet/feature/resque_fix
...
fix resque start
2012-11-28 10:35:32 -08:00
Dmitriy Zaporozhets
e9be4b375b
Cover ProjectMover with tests
2012-11-21 06:18:05 +03:00
Dmitriy Zaporozhets
47234ab367
Validate username. Gitlab::Regex added
2012-11-28 06:14:05 +03:00
Riyad Preukschas
d2767221a5
Fix code blocks in Markdown not knowing about the user's color scheme
2012-11-27 22:51:07 +01:00
Dmitriy Zaporozhets
039996bd0a
Fix invalid method call for gitolite
2012-11-27 16:35:00 +02:00
Dmitriy Zaporozhets
f5551efdfd
Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues
2012-11-27 09:31:15 +03:00
Dmitriy Zaporozhets
70bf7f6e19
Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo
2012-11-21 08:54:05 +03:00
Dmitriy Zaporozhets
ab42370af0
Fix sattellites
2012-11-21 09:14:05 +03:00
Dmitriy Zaporozhets
2d5a6fc850
Fix dir permission on creation
2012-11-26 13:07:16 +02:00
Dmitriy Zaporozhets
ca8bb9dff8
Fix projectmover dir permission
2012-11-26 12:52:49 +02:00
Dmitriy Zaporozhets
585eb70588
Fix http push with namespaces. Allow use of username as login
2012-11-26 11:23:08 +02:00
Dmitriy Zaporozhets
ae282f6326
remove invalid condition
2012-11-25 18:29:18 +02:00
Dmitriy Zaporozhets
04b51a2b89
Improve activate_namespace task to build missing dirs and moving repos correctly
2012-11-25 18:24:27 +02:00
Dmitriy Zaporozhets
fbe03c506f
Improved namespace activation task
2012-11-25 17:58:06 +02:00
Dmitriy Zaporozhets
d405c8fc60
Create namespace on username init. Raise exception if project cannot be moved
2012-11-24 12:25:04 +02:00
Dmitriy Zaporozhets
4023d9f852
class for moving project
2012-11-24 11:46:19 +02:00
Dmitriy Zaporozhets
0693215c30
Fixed spinach and tests. Build should pass now
2012-11-23 22:55:38 +02:00
Dmitriy Zaporozhets
0e1635a68a
Fixing requests after namespaces. Fixed admin bug with access to project
2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets
9304d049de
Fixed some tests and snippet colorize
2012-11-23 22:31:09 +03:00
Dmitriy Zaporozhets
c50ec72b52
Deprecate code for Project. Use title and path
2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
5ca1772385
Init username migration and rake task for create appropriate namespace
2012-11-23 06:34:09 +03:00
Dmitriy Zaporozhets
a4d1bc1791
Use namespace in gitolite config
2012-11-22 22:51:26 +03:00
Dmitriy Zaporozhets
65327cfc08
Rewrite hooks shell script
2012-11-22 12:24:46 +02:00
Gosuke Miyashita
71ff619973
Fix hash key settings["gitlab_version"] to settings[:gitlab_version]
...
In backup_create, backup information hash is using symbol as its key.
But in backup_restore, string key is used and it returns empty value.
2012-11-22 10:38:56 +09:00
Dmitriy Zaporozhets
4c6c24856c
Themes refactored
2012-11-21 18:19:03 +02:00
Dmitriy Zaporozhets
3ab33fcfca
Add post-receive file content validation
2012-11-21 09:04:32 +02:00
Dmitriy Zaporozhets
b39002ce88
Use namespace for gitlab resque
2012-11-21 00:40:29 +02:00
Hugo Duksis
e7e1e99e92
retrieve settings with symbols
2012-11-19 22:42:58 +02:00
Dmitriy Zaporozhets
a85e11fa51
Improved seeds for development env
2012-11-13 22:11:56 +02:00
Dmitriy Zaporozhets
f0a6fbaae3
Improve Commits stats code
2012-11-13 21:26:57 +02:00
David Barri
93f0a8c9b3
Merge remote-tracking branch 'gitlabhq/master' into git_commit_fix
...
Conflicts:
doc/install/installation.md
2012-11-11 21:27:55 +11:00
randx
3e04673334
Added feature test for stats
2012-11-10 23:33:10 +02:00
randx
1c5b2a5153
Stats page
2012-11-10 23:08:47 +02:00
Riyad Preukschas
ca54d43f99
Fix 500s because of "missing" lexer
2012-11-10 00:55:56 +01:00
Saito
6cec9ed328
linguist will take care of this
2012-11-10 01:36:55 +08:00
David Barri
944d3823c3
Fix for git commit when nothing to commit.
...
Turns out git commit returns with 128 when user.name config not present.
2012-11-09 08:32:00 +11:00
Saito
f1ac2a616b
remove encode lib, clean all encoded area.
2012-11-09 01:41:07 +08:00
David Barri
6f25967c47
Fixed issue with git commit silently failing.
...
Also updated status task and installation instuctions.
2012-11-08 10:47:11 +11:00
Valeriy Sizov
d6a5e3dad7
Merge pull request #1735 from NARKOZ/api
...
API fixes
2012-11-07 03:50:42 -08:00
Valeriy Sizov
0d4568db78
gitolite custom config
2012-11-07 00:47:33 +02:00
Dmitriy Zaporozhets
f555578414
Added EventFilter class. Compeleted first version of dashbaord filtering
2012-11-05 20:12:26 +02:00
randx
dd4d124832
remove accidently created file
2012-11-04 23:44:58 +02:00
randx
f082c8ae2a
Decouple and refactor GraphCommit
2012-11-04 23:43:33 +02:00
Dmitriy Zaporozhets
2032f4cd96
Fix tests fail cause of issue with grit stub
2012-10-31 15:22:13 +02:00
Dmitriy Zaporozhets
37e39e4176
Added bare import script. Removed old unworking script
2012-10-30 13:04:56 +02:00
Dmitriy Zaporozhets
50a6c614b5
Merge pull request #1818 from riyad/refactor-satellite-actions
...
Refactor Satellite Code
2012-10-29 04:12:26 -07:00
Michele Franzin
c370c1b389
gitolite's repositories folder symlinked patch
2012-10-27 16:12:01 +02:00
randx
72f984e3d3
Prevent grit from caching graph commits
2012-10-26 21:52:26 +03:00
Saito
4f687aaa8e
Merge pull request #1827 from mgrobelin/master
...
grack auth bugfix: allow dots in reponame
2012-10-26 06:35:37 -07:00
Markus Grobelin
bd50a9f466
grack: allow repositories to have dots in name, e.g. serverconfigs-example.com.git
2012-10-26 14:05:57 +02:00
Riyad Preukschas
904615c150
Update satellite action docs
2012-10-26 02:50:24 +02:00
Riyad Preukschas
7192f86ed0
Fix Satellite#lock
2012-10-26 02:32:17 +02:00
Riyad Preukschas
700a784bc9
Refactor EditFileAction#update and rename it to commit!
2012-10-26 01:59:50 +02:00
Riyad Preukschas
3080127354
Fix timeouts in MergeAction
2012-10-26 01:44:50 +02:00
Riyad Preukschas
0ebcc60a33
Move locking from Satellite::Action to Satellite and add checks
2012-10-26 01:44:20 +02:00
Riyad Preukschas
0e9d4f30f4
Refactor Satellite#clear and rename it to clear_and_update!
2012-10-26 01:32:33 +02:00
Riyad Preukschas
fba8ad5607
Move Gitlab::Satellite into the Satellite module
2012-10-26 00:56:24 +02:00
Riyad Preukschas
5f16687805
Update arguments for Gitlab::Satellite::EditFileAction#initialize
2012-10-26 00:39:23 +02:00
Riyad Preukschas
55779b00ea
Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction
2012-10-26 00:33:53 +02:00
Riyad Preukschas
8c89beb6f9
Change argument order for satellite actions to always start with the user
2012-10-26 00:26:47 +02:00
Riyad Preukschas
35b7a53955
Reorder methods in Gitlab::Satellite
2012-10-26 00:24:16 +02:00
Riyad Preukschas
8778961d33
Move prepare_satellite! to Gitlab::Satelite::Action
2012-10-26 00:24:02 +02:00
Riyad Preukschas
78235edda8
Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction
2012-10-26 00:19:01 +02:00
Riyad Preukschas
847bba9269
Add Gitlab::Satellite::Action
2012-10-26 00:10:40 +02:00
Riyad Preukschas
643ed9cbf3
Fix typos in Gitlab::Merge
2012-10-25 23:49:49 +02:00
Valeriy Sizov
4281de3640
API: review 2
2012-10-25 13:38:55 +03:00
Valeriy Sizov
e6cdfb607a
API: tests for merge_requests
2012-10-25 13:13:01 +03:00
Valeriy Sizov
77bc110107
API: help page and comment
2012-10-22 23:09:21 +03:00
Valeriy Sizov
6ffd2f3db6
Changes after review
2012-10-22 23:09:21 +03:00
Valeriy Sizov
93e8d426c5
API: merge request: post comment call
2012-10-22 23:09:21 +03:00
Valeriy Sizov
b32a8eea93
API: MergeRequest: authorization
2012-10-22 23:09:21 +03:00
Valeriy Sizov
524b907042
API: MergeRequest refactoring
2012-10-22 23:09:21 +03:00
Valeriy Sizov
5a89934af8
API: update merge request call
2012-10-22 23:09:21 +03:00
Valeriy Sizov
fe59547ae5
API: create merge request
2012-10-22 23:09:21 +03:00
Valeriy Sizov
bd049e5e7c
API:merge request show && list
2012-10-22 23:09:21 +03:00
Dmitriy Zaporozhets
893ce9ae24
Fix git over HTTP
2012-10-22 18:45:42 +03:00
randx
351b0e758b
Log OutOfMemory exceptions from Merge Requests with GitLogger
2012-10-21 20:29:19 +03:00
Dmitriy Zaporozhets
fb903de508
Merge pull request #1740 from godric7/master
...
Enable Oauth login for existing regular users
2012-10-21 09:13:35 -07:00
randx
0189ee97ed
Security for online editor. Replace dev_access?, master_access? with can? method usage
2012-10-21 12:12:14 +03:00
Riyad Preukschas
122769e358
Refactor Gitlab::Merge
...
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
2012-10-20 15:25:48 +02:00
Godric
054c15e7b5
enable Oauth login for existing regular users
...
fix: https://github.com/gitlabhq/gitlabhq/issues/1620
2012-10-20 00:38:07 +03:00
Nihad Abbasov
00325a733a
name and password_confirmation not required to create a user via API
2012-10-19 03:34:18 -07:00
Nihad Abbasov
c610206321
fix mass-assignment error in user create API
2012-10-19 03:23:10 -07:00
Dmitriy Zaporozhets
c007325451
Merge pull request #1712 from riyad/use-gem-for-emoji
...
Use gem for Emoji
2012-10-18 00:28:47 -07:00
Riyad Preukschas
ce91014730
Fix use of Emoji
2012-10-18 01:10:35 +02:00
Riyad Preukschas
5d42d92c87
Remove old Emoji code and images
2012-10-18 01:10:35 +02:00
Valeriy Sizov
883d138f15
Fix 500 error when project is empty
2012-10-17 23:59:42 +03:00
Valeriy Sizov
7a0a552b43
revert
2012-10-17 15:21:16 +03:00
Valeriy Sizov
31f1cebe4b
Wiki style: move styles to right place
2012-10-17 15:17:27 +03:00
Valeriy Sizov
d8262573b8
Merge pull request #1719 from SaitoWu/features/sharedRepository
...
add shared repository support
2012-10-17 02:27:40 -07:00
Saito
83626d05cd
add shared repository support
2012-10-17 15:43:44 +08:00
Riyad Preukschas
f120e5a89a
Use shorthand as in TreeController#edit
2012-10-15 23:40:23 +02:00
randx
809aefb828
Minor improve to UI and code formatting of gitlab web editor
2012-10-15 19:51:11 +03:00
Valeriy Sizov
42bdfd021b
WebEditor: base implementation
2012-10-12 20:07:24 +03:00
Valeriy Sizov
0b3e9fd218
WebEditor: Check if save is possible
2012-10-12 20:07:24 +03:00
Valeriy Sizov
e53b47b447
WebEditor: sceleton
2012-10-12 20:07:24 +03:00
jozefvaclavik
d1a18d038d
Update lib/api/projects.rb
...
Added methods for listing one project hook and editing hooks.
GET /project/:id/hooks/:hook_id
PUT /project/:id/hooks/:hook_id
2012-10-12 10:30:09 +03:00
Valeriy Sizov
a54a90188b
remove unnecessary task
2012-10-09 14:59:58 +03:00
Andrey Kumanyaev
03836cc591
fix resque start
2012-10-09 00:19:07 +04:00
Nihad Abbasov
61f12da3a5
API: add project snippets listing
2012-10-08 02:13:53 -07:00
Nihad Abbasov
ad5b5d1e51
projects API should return info about deleted hook
2012-10-08 01:54:50 -07:00
Nihad Abbasov
d2ea858fbf
move emoji module to lib
2012-10-05 07:42:23 -07:00
Nihad Abbasov
317c928198
improve emoji checking performance
2012-10-05 07:23:58 -07:00
Robert Speicher
3606a14889
ExtractsPath: Use ref_names instead of branches+tags
2012-10-04 14:13:52 -04:00
Valeriy Sizov
e25ddca0c4
Fix bug with branches whose name contains slash
2012-10-04 19:31:31 +03:00
Valeriy Sizov
bd5334abc2
fix inline diff
2012-10-04 13:28:58 +03:00
Dmitriy Zaporozhets
2985697af7
Real fix for removing keys. Closes PR #1616
2012-10-03 15:56:41 +03:00
Valeriy Sizov
e7608cd6f9
API: private token via header
2012-10-02 18:43:35 +03:00
Valeriy Sizov
2e1c3c52bc
#1606 Fixes
2012-10-02 18:08:04 +03:00
Valeriy Sizov
e9c356092b
#1606 API private token via the header
2012-10-02 18:02:21 +03:00
Valeriy Sizov
d104df49e7
fix TYPO
2012-10-02 16:34:20 +03:00
Valeriy Sizov
825081174a
#1585 Api for user creation: base implementation
2012-10-02 12:46:01 +03:00
Maxim Filatov
93cb01ea9b
Auth: Net::BER::BerIdentifiedStrings to Strings
2012-09-28 18:08:13 +04:00
Vincent Bonmalais
1fe45898d7
Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.
...
When working inside of a Vagrant box with NFS enabled, the deletion of a
repository in tmp/ doesn't work every time.
It is related to NFS inability to delete a folder if it's still used by
a resource (e.g. `rm -rf ./folder` would leave the folder and a .nfs*
file in it). In this case it's the temporary repository which can't
be deleted because `ga_repo` is still using it.
De-allocating ga_repo is not possible (thanks Ruby), but deleting the
folder it points to in the first place fixes the issue.
Reference:
http://stackoverflow.com/questions/11228079/python-remove-directory-error-file-exists
2012-09-28 16:53:02 +10:00
Dmitriy Zaporozhets
3e9836ae1e
Merge pull request #1526 from namtzigla/dot-repos-names
...
changed the post-receive hook in order to push the correct repository
2012-09-27 10:22:33 -07:00
Robert Speicher
afc4a75499
Use Rails.root.join where appropriate
2012-09-26 16:32:26 -04:00
Robert Speicher
835be5b1bf
ExtractPaths - Only call assign_ref_vars on show action
2012-09-26 16:32:22 -04:00
Robert Speicher
a1e68a9120
Rename RefExtractor to ExtractsPath
...
Update docs a bit
2012-09-26 16:32:22 -04:00
Robert Speicher
a8ea8d98a4
Update RefExtractor to handle atom feeds
2012-09-26 16:32:22 -04:00
Robert Speicher
398ba6f1bb
DRY up Blame, Blob and Tree controllers
2012-09-26 16:32:22 -04:00
Robert Speicher
37f0b600bc
Another RefExtractor refactor
2012-09-26 16:32:22 -04:00
Robert Speicher
567767bcf2
Add ref_extractor helper module for upcoming controllers
2012-09-26 16:32:21 -04:00
Robert Speicher
b389247c02
Use Commit#show instead of Commits#show to view a single commit
...
Commits#show (plural) is going to be for showing commit history on a
specific path.
2012-09-26 16:32:21 -04:00
Nihad Abbasov
4629cc44d6
fix mass assignment error in create_from_omniauth after a6a229a
2012-09-26 11:18:25 -07:00
Nihad Abbasov
83696b127b
cleanup rake tasks
2012-09-26 04:18:10 -07:00
Florin Stan
6424fc715b
changed the post-receive hook in order to push the correct repository name when the name contain special characters
2012-09-21 13:02:59 -06:00
Nihad Abbasov
b62445813d
API: SSH keys belong to user entity
2012-09-21 04:49:28 -07:00
Nihad Abbasov
4a072be2d7
API: commits belong to project repository
2012-09-21 04:34:07 -07:00
Dmitriy Zaporozhets
131553627d
Merge pull request #1521 from NARKOZ/api
...
API for project team members
2012-09-21 04:19:16 -07:00
Nihad Abbasov
25b745271a
add API for project team members
2012-09-21 03:23:17 -07:00
Dmitriy Zaporozhets
10d3a30b25
APi for commits. Better api docs
2012-09-21 13:22:30 +03:00
Nihad Abbasov
b08d33f6a9
API: return 401 for invalid session
2012-09-20 08:38:08 -07:00
Nihad Abbasov
3dd940d4cb
API: extend UserLogin entity from UserBasic
2012-09-20 08:36:43 -07:00
Dmitriy Zaporozhets
9aafe77e70
I want be able to get token via api. Used for mobile applications
2012-09-20 17:45:07 +03:00
Nihad Abbasov
37817cc31d
API: expose project id for milestones
2012-09-20 18:38:34 +06:00
Dmitriy Zaporozhets
ed899a2f4b
Replace sanitize with escape once
2012-09-20 11:50:22 +03:00
randx
6104942438
Sanitize for network graph
2012-09-20 09:06:12 +03:00
Robert Speicher
345c4d2a77
Update gfm so escaped text is still parsed for references
2012-09-19 20:21:35 -04:00
Saito
aaa916f15c
use high level api and compatibility with Passenger
2012-09-17 18:36:23 +08:00
Alex Denisov
c83af0dfe7
Uses attributes_for_keys
2012-09-16 22:44:20 +03:00
Alex Denisov
b6c6a5b159
Merge branch 'master' into ssh_keys_api
2012-09-16 22:37:50 +03:00
Alex Denisov
b896880eb4
Method name changed
2012-09-16 20:08:57 +03:00
Alex Denisov
549c4c2202
API attributes refactored
2012-09-16 19:51:04 +03:00
Alex Denisov
87d40fd276
Docs added
2012-09-16 18:21:59 +03:00
Alex Denisov
c23eb40829
SSH Keys API implemented
2012-09-16 17:52:06 +03:00
Robert Speicher
d993f66642
Fix HTML entities being parsed in GFM
...
Also fixes the spec so that it actually tests the thing it says it's
testing. Hooray!
Closes #1308
2012-09-13 15:20:00 -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
3643df1f7c
Merge pull request #1411 from miks/project_hooks_api
...
Project hooks API
2012-09-12 12:16:35 -07:00
Dmitriy Zaporozhets
048d47e626
Refactorn oauth & ldap
2012-09-12 09:23:16 +03:00
randx
0523b4265b
Application logger
2012-09-11 23:24:53 +03:00
Dmitriy Zaporozhets
3f01ec2d5b
Merge pull request #1426 from NARKOZ/spinach
...
Cucumber => Spinach
2012-09-10 09:09:07 -07:00
miks
6d76e000d0
Add authorization to hooks requests
2012-09-10 16:50:01 +03:00
miks
2e34a6d3c4
Merge branch 'master' into project_hooks_api
2012-09-10 16:47:31 +03:00
Nihad Abbasov
ae9689f8ff
remove cucumber completely
2012-09-10 06:40:57 -07:00
Alex Denisov
e68d0841be
Merge branch 'master' into api_errors_refactoring
2012-09-10 14:10:34 +03:00
Alex Denisov
a065557208
Common errors method added
2012-09-10 13:49:00 +03:00
Alex Denisov
915dac0055
Error throwing moved to api_helper
2012-09-10 10:41:46 +03:00
Cyril
e7f483f9f4
fix typo
2012-09-10 10:50:07 +02:00
randx
b565f33472
Auth for API
2012-09-10 09:06:11 +03:00
miks
3b5a90bdf6
Projects hooks API implemented
2012-09-08 20:51:12 +03:00
miks
27e4436507
Return empty body
2012-09-08 20:01:08 +03:00
miks
4226458faf
Merge branch 'master' into project_users_api
2012-09-08 10:50:24 +03:00
Riyad Preukschas
d661b893c5
Prevent gfm() to leak changes to the string supplied through the _text_ argument
2012-09-08 01:58:12 +02:00
Riyad Preukschas
ce3fb94939
Fix bug where parsing of emoji was unnecessarily dependent on @project being set
2012-09-08 01:11:44 +02:00
Riyad Preukschas
5348ee6278
Fix Ruby anti-pattern in Markdown
2012-09-07 22:14:17 +02:00
randx
e8f39a0a61
gitolite -> more exceptions
2012-09-07 20:43:51 +03:00
Dmitriy Zaporozhets
963746f978
Refactor gitolite_config
2012-09-07 09:15:30 +03:00
randx
b994a65fc3
change gitolite backend behaviour to prevent error when config directory removed
2012-09-07 15:36:40 +03:00
Dmitriy Zaporozhets
79021e674b
Split gitolite backend. Use gitolite_config methods moved to separate class
2012-09-07 08:16:29 +03:00
Dmitriy Zaporozhets
137594dd08
Merge pull request #1339 from chopmann/fix-import_bulk
...
fix bulk_import for #1309
2012-09-07 00:44:44 -07:00
randx
5cb9e7eedc
Fix emojii
2012-09-07 09:16:04 +03:00
Dmitriy Zaporozhets
4f8a4aa44c
Merge pull request #1384 from tsigo/emoji
...
Emoji!
2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets
7c0a1068bf
Merge pull request #1363 from AlexDenisov/api_create_project_fixes
...
API create project fixes
2012-09-06 23:00:04 -07:00
miks
909c8c345d
Make project users API more RESTful
2012-09-06 23:49:29 +03:00
Robert Speicher
3a63f6f316
Simplify EMOJI_PATTERN
2012-09-06 15:26:55 -04:00
Robert Speicher
8808c5fa8d
Merge branch 'master' into emoji
2012-09-06 15:23:42 -04:00
Alex Denisov
09a86bd4d6
Capitlization of /gitlab/i normalized. #1367
2012-09-06 11:21:35 +03:00
Cornelio
b3c8688da3
fix bulk_import for #1309
2012-09-06 08:56:46 +02:00
miks
e3b1f62c6b
convert params hash to array
2012-09-06 00:13:25 +03:00
Robert Speicher
b3bbf53e9b
Set the size of emoji to be 20x20
...
Forgot they were so big!
2012-09-05 16:14:54 -04:00
Robert Speicher
67a6a0b29b
Change Gitlab::Markdown to a module; add emoji parsing
2012-09-05 16:07:39 -04:00
miks
8f7360f390
API on adding users to project implemented
2012-09-05 23:01:03 +03:00
Alex Denisov
9b9dd3f9bf
Unnecessary code removed
2012-09-05 11:44:47 +03:00
randx
d59d2a197e
cleanup gitlab from setup scripts
2012-09-04 20:29:20 +03:00
randx
874a86f820
update install to use recipes
2012-09-04 19:44:17 +03:00
Robert Speicher
12c57a7061
Change hardcoded base path to use Gitlab settings
...
Closes #1072
2012-09-04 05:05:56 -04:00
Tse-Ching Ho
457b0f604f
use APP_ROOT in init-gitlab to specify root of project
2012-09-04 16:39:10 +08:00
Alex Denisov
e078a173d6
Create project via API: fixes added
2012-09-03 18:00:24 +03:00
Nihad Abbasov
76e4d94d43
add pagination to API
2012-09-03 04:46:29 -07:00
Dmitriy Zaporozhets
cc03600b22
Merge pull request #1347 from AlexDenisov/api_project_creation
...
API for new project creation
2012-09-03 01:48:51 -07:00
Sytse Sijbrandij
cc137bba79
Update the references to the script and refer to it from the installation manual.
...
Update the references to the script and refer to it from the installation manual.
Indent the code block.
2012-09-02 22:44:11 +02:00
Dmitriy Zaporozhets
65402f1a1a
Merge pull request #1318 from dosire/non-interactive-aws-install
...
Non interactive aws install
2012-09-02 12:09:48 -07:00
Robert Speicher
40d619107f
Add link_title to CommitDecorator
2012-09-02 13:40:14 -04:00
Sytse Sijbrandij
b80dd3d242
Non-interactive AWS install by running a single script.
...
Merge branch 'master' into non-interactive-aws-install
Conflicts:
doc/installation.md
Fix merge mess in installation.md
2012-09-02 18:39:50 +02:00
Sytse Sijbrandij
eae41ad1df
Non-interactive AWS install by running a single script.
...
Non-interactive AWS install by running a single script.
Complete non-interactive AWS install with one line.
Squash of 28 commits:
Initial commit of complete install script.
Must be sudo.
Non interactive prostgres.
Install mysql with unique password.
Service file.
Add init file.
Nginx config.
Script contains aws specific settings.
Update references after rename.
Prevent localhost ssh prompt.
Postfix with policyd.
Typo in localhost. Postfix package has other name. sudo -l session needs oneliners.
More sudo commands to prevent permission problems.
Change in existing file.
Change in existing file must be referenced.
Switch order.
Postfix comment.
Old way to generate password, less sudo.
todo login
Must use private ip and login instructions.
Starting up.
Fixed and checked various todos.
Use service. Set host name. Go to default dir.
Only works on next login.
Only replace first host.
Cleaned up the comments.
Link to nginx config.
Move to aws dir.
Update links to aws for interactive install.
Existing script stays at the same location.
Change directory. Use the new init scripts for gitlab service and nginx. Use the branch for file downloads. Update with newest changes to installation.md.
Correct reference.
Use master branch since we need the nginx condfig and use absolute paths.
Need to copy with sudo.
2012-09-02 18:29:46 +02:00
Alex Denisov
9811e64d71
Typo and mistakes fixed
2012-08-31 11:11:12 +03:00
Alex Denisov
c1173e2707
API on Projects creation implemented
2012-08-31 10:15:37 +03:00
Robert Speicher
8a49cdc3b4
Add milestone API docs to doc/README and views/help/api
...
Also removes `closed` attribute option from create action.
2012-08-29 08:45:00 -04:00
Dmitriy Zaporozhets
14f5d1727a
Merge branch 'milestone_api' of https://github.com/tsigo/gitlabhq into tsigo-milestone_api
...
Conflicts:
spec/requests/api/issues_spec.rb
2012-08-29 15:35:12 +03: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