OSDN Git Service
Riyad Preukschas [Wed, 2 Jan 2013 19:50:24 +0000 (20:50 +0100)]
Fix commit note notification
Riyad Preukschas [Wed, 2 Jan 2013 19:49:27 +0000 (20:49 +0100)]
Fix comment and reply buttons
Riyad Preukschas [Sun, 23 Dec 2012 00:03:57 +0000 (01:03 +0100)]
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
Riyad Preukschas [Sat, 22 Dec 2012 21:22:51 +0000 (22:22 +0100)]
Add instructions to fix permissions for /home/git/.gitolite/
Riyad Preukschas [Sat, 22 Dec 2012 19:36:33 +0000 (20:36 +0100)]
Fix Commit#to_diff
Riyad Preukschas [Sat, 22 Dec 2012 19:06:18 +0000 (20:06 +0100)]
Remove path parameter from projects API
Dmitriy Zaporozhets [Sat, 22 Dec 2012 17:52:28 +0000 (19:52 +0200)]
Implement UsersProject project_access validation
Riyad Preukschas [Sat, 22 Dec 2012 14:52:42 +0000 (15:52 +0100)]
Fix docs to download and compile Ruby in /tmp/ruby
Riyad Preukschas [Sat, 22 Dec 2012 14:33:22 +0000 (15:33 +0100)]
Remove bundler calls from databases.md
GitLab is not yet downloaded at this point in the installation guide.
Riyad Preukschas [Sat, 22 Dec 2012 14:16:16 +0000 (15:16 +0100)]
Fix sudo install command in installation guide
Fixes #2334
Dmitriy Zaporozhets [Sat, 22 Dec 2012 12:34:38 +0000 (14:34 +0200)]
Fix #2220
Dmitriy Zaporozhets [Sat, 22 Dec 2012 12:18:40 +0000 (14:18 +0200)]
Fixed wierd gitlab markdown issue
Dmitriy Zaporozhets [Sat, 22 Dec 2012 11:01:15 +0000 (13:01 +0200)]
Improve wiki rendering. Fix pygemnt + markdown invalid html
Dmitriy Zaporozhets [Sat, 22 Dec 2012 10:01:54 +0000 (12:01 +0200)]
Fix order of db setup in installation docs
Dmitriy Zaporozhets [Sat, 22 Dec 2012 09:59:05 +0000 (11:59 +0200)]
Fixed #2333
Dmitriy Zaporozhets [Sat, 22 Dec 2012 08:43:17 +0000 (00:43 -0800)]
Merge pull request #2330 from gitlabhq/v4.0-api-fixes
V4.0 API fixes
Dmitriy Zaporozhets [Fri, 21 Dec 2012 21:22:52 +0000 (23:22 +0200)]
Fix fark background highlight
Riyad Preukschas [Fri, 21 Dec 2012 17:55:39 +0000 (18:55 +0100)]
Up API version to v3
Riyad Preukschas [Fri, 21 Dec 2012 17:47:04 +0000 (18:47 +0100)]
Remove all references tp the project code parameter from the API
Riyad Preukschas [Fri, 21 Dec 2012 17:43:46 +0000 (18:43 +0100)]
Remove the code parameter from the projects API
Dmitriy Zaporozhets [Fri, 21 Dec 2012 11:37:44 +0000 (13:37 +0200)]
Fixed tests
Dmitriy Zaporozhets [Fri, 21 Dec 2012 11:07:47 +0000 (13:07 +0200)]
Merge branch 'koenpunt-gh-issue-1509'
Dmitriy Zaporozhets [Fri, 21 Dec 2012 11:07:34 +0000 (13:07 +0200)]
Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
Conflicts:
vendor/assets/javascripts/branch-graph.js
Dmitriy Zaporozhets [Fri, 21 Dec 2012 10:47:55 +0000 (02:47 -0800)]
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
Fix and refactoring gfm_autocomplete
Riyad Preukschas [Thu, 20 Dec 2012 21:24:05 +0000 (22:24 +0100)]
Fix text in project move mail
Dmitriy Zaporozhets [Thu, 20 Dec 2012 21:12:38 +0000 (23:12 +0200)]
Release candidate 1
Dmitriy Zaporozhets [Thu, 20 Dec 2012 21:06:14 +0000 (13:06 -0800)]
Merge pull request #2323 from riyad/rename-tasks
Rename tasks
Dmitriy Zaporozhets [Thu, 20 Dec 2012 21:04:27 +0000 (23:04 +0200)]
Fix email send on close/reopen issue. Display project name with namespace. remove css style
Riyad Preukschas [Thu, 20 Dec 2012 19:05:01 +0000 (20:05 +0100)]
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
Riyad Preukschas [Thu, 20 Dec 2012 19:17:09 +0000 (20:17 +0100)]
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
Riyad Preukschas [Thu, 20 Dec 2012 20:52:26 +0000 (21:52 +0100)]
Add gitlab:satellites:create as an alias for gitlab:enable_automerge
Dmitriy Zaporozhets [Thu, 20 Dec 2012 20:16:51 +0000 (22:16 +0200)]
Send update instructions after project namespace id changed or namespace path changed
Riyad Preukschas [Thu, 20 Dec 2012 18:38:44 +0000 (19:38 +0100)]
Rename gitlab:app:enable_automerge to gitlab:enable_automerge
Riyad Preukschas [Thu, 20 Dec 2012 18:31:29 +0000 (19:31 +0100)]
Rename gitlab:activate_namespaces to gitlab:enable_namespaces
Dmitriy Zaporozhets [Thu, 20 Dec 2012 19:16:42 +0000 (21:16 +0200)]
Changelog updated. Added warnings to username form
Valeriy Sizov [Tue, 18 Dec 2012 18:52:18 +0000 (20:52 +0200)]
refactoring gfm_autocomplete
Dmitriy Zaporozhets [Thu, 20 Dec 2012 18:46:57 +0000 (10:46 -0800)]
Merge pull request #2321 from riyad/update-contrib-docs
Update Contribution Guide
Riyad Preukschas [Thu, 20 Dec 2012 17:53:23 +0000 (18:53 +0100)]
Update CONTRIBUTING.md
Riyad Preukschas [Thu, 20 Dec 2012 17:53:07 +0000 (18:53 +0100)]
Remove development.md
Dmitriy Zaporozhets [Thu, 20 Dec 2012 16:47:38 +0000 (08:47 -0800)]
Merge pull request #2247 from riyad/update-settings
Reorganize settings
Riyad Preukschas [Thu, 20 Dec 2012 15:51:14 +0000 (16:51 +0100)]
Updated gitlab:check task
Riyad Preukschas [Sat, 15 Dec 2012 01:19:21 +0000 (02:19 +0100)]
Fix gravatar and ldap config
Riyad Preukschas [Sat, 15 Dec 2012 00:16:25 +0000 (01:16 +0100)]
Update uses of Gitolite.config.foo settings
Riyad Preukschas [Thu, 20 Dec 2012 15:52:29 +0000 (16:52 +0100)]
Refactor Settings initializer
All overrides are marked as deprecated.
Default settings are at the bottom.
Riyad Preukschas [Sat, 15 Dec 2012 00:45:44 +0000 (01:45 +0100)]
Rename config options
Dmitriy Zaporozhets [Thu, 20 Dec 2012 15:46:59 +0000 (07:46 -0800)]
Merge pull request #2211 from jojosch/fix-dark-code-preview
fix dark code preview background when displaying long lines
Dmitriy Zaporozhets [Thu, 20 Dec 2012 14:42:13 +0000 (16:42 +0200)]
Fix issue update.js
Dmitriy Zaporozhets [Wed, 19 Dec 2012 17:14:05 +0000 (20:14 +0300)]
Pretty compare mode
Dmitriy Zaporozhets [Thu, 20 Dec 2012 14:15:39 +0000 (06:15 -0800)]
Merge pull request #2315 from koenpunt/gh-issue-513
Added compare switch
Koen Punt [Thu, 20 Dec 2012 13:58:07 +0000 (14:58 +0100)]
Added icon
Koen Punt [Thu, 20 Dec 2012 13:42:05 +0000 (14:42 +0100)]
only show switch if from and to are set
Koen Punt [Thu, 20 Dec 2012 13:39:39 +0000 (14:39 +0100)]
Updated test to match with switched commits
Added compare switch
Koen Punt [Thu, 20 Dec 2012 12:50:43 +0000 (13:50 +0100)]
disabled sorting of commits before compare
Koen Punt [Thu, 20 Dec 2012 12:31:09 +0000 (13:31 +0100)]
Flipping commit ids in commits_between, fixes #513
Dmitriy Zaporozhets [Wed, 19 Dec 2012 04:14:05 +0000 (07:14 +0300)]
show production.log, show only active milestone for issue filter
Dmitriy Zaporozhets [Thu, 20 Dec 2012 13:50:42 +0000 (13:50 +0000)]
Merge branch 'refactor_issues' of dev.gitlabhq.com:gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 20 Dec 2012 13:39:54 +0000 (15:39 +0200)]
Cleanup after issues refactor and fix test
Dmitriy Zaporozhets [Thu, 20 Dec 2012 13:14:14 +0000 (05:14 -0800)]
Merge pull request #2314 from koenpunt/gh-issue-513
Disabled sorting commit ids
Dmitriy Zaporozhets [Wed, 19 Dec 2012 03:14:05 +0000 (06:14 +0300)]
Refactor issues, Remove ajax
Dmitriy Zaporozhets [Tue, 18 Dec 2012 16:39:35 +0000 (18:39 +0200)]
Return postgres to travis
Dmitriy Zaporozhets [Tue, 18 Dec 2012 03:14:05 +0000 (06:14 +0300)]
Refactor css lists. Use well-list class
Dmitriy Zaporozhets [Tue, 18 Dec 2012 03:14:05 +0000 (06:14 +0300)]
Labels autocomplete
Dmitriy Zaporozhets [Thu, 20 Dec 2012 09:52:42 +0000 (11:52 +0200)]
Few icons for services list
Dmitriy Zaporozhets [Wed, 19 Dec 2012 19:04:39 +0000 (11:04 -0800)]
Merge pull request #2311 from gitlabhq/refactor_scss
Better organization of styles
Dmitriy Zaporozhets [Wed, 19 Dec 2012 18:57:41 +0000 (20:57 +0200)]
Remove main. Use application.scss instead
Dmitriy Zaporozhets [Wed, 19 Dec 2012 17:44:15 +0000 (19:44 +0200)]
Change travis rake task
Dmitriy Zaporozhets [Wed, 19 Dec 2012 17:02:12 +0000 (19:02 +0200)]
Move mixins and variables under gitlab bootstrap
Dmitriy Zaporozhets [Wed, 19 Dec 2012 16:34:24 +0000 (18:34 +0200)]
Better organization of styles
Dmitriy Zaporozhets [Wed, 19 Dec 2012 10:28:35 +0000 (02:28 -0800)]
Merge pull request #2304 from gitlabhq/fix_postgres_notes
Split commit_id and noteable_id for Note
Dmitriy Zaporozhets [Wed, 19 Dec 2012 10:08:27 +0000 (12:08 +0200)]
index for commit_id. Schema rebuiled. Non rollback migration exception added
Dmitriy Zaporozhets [Tue, 18 Dec 2012 19:06:29 +0000 (21:06 +0200)]
if for migration
Dmitriy Zaporozhets [Tue, 18 Dec 2012 18:43:44 +0000 (20:43 +0200)]
Make tests green for postgres
Dmitriy Zaporozhets [Tue, 18 Dec 2012 18:02:00 +0000 (20:02 +0200)]
Split commit_id and noteable_id for Note
Dmitriy Zaporozhets [Mon, 17 Dec 2012 13:57:10 +0000 (15:57 +0200)]
Fix admin paging gap issue
Dmitriy Zaporozhets [Mon, 17 Dec 2012 13:11:33 +0000 (15:11 +0200)]
gitolite fork up to v320
Dmitriy Zaporozhets [Sun, 16 Dec 2012 17:52:39 +0000 (19:52 +0200)]
Fix wall notes event trying to render target
Dmitriy Zaporozhets [Sun, 16 Dec 2012 16:27:16 +0000 (18:27 +0200)]
Account role spec
Dmitriy Zaporozhets [Sun, 16 Dec 2012 16:16:42 +0000 (08:16 -0800)]
Merge pull request #2250 from jouve/fix_missing_tr_in_thead
add missing mandatory tr in thead
Dmitriy Zaporozhets [Sun, 16 Dec 2012 16:15:57 +0000 (08:15 -0800)]
Merge pull request #2287 from Partugal/patch-add-more-restricts-to-project-name
added more denied project names
Johannes Schleifenbaum [Fri, 7 Dec 2012 12:11:51 +0000 (13:11 +0100)]
fix dark code preview background when displaying long lines
Sergey Linnik [Sat, 15 Dec 2012 10:33:45 +0000 (14:33 +0400)]
added more denied project names
Dmitriy Zaporozhets [Sat, 15 Dec 2012 10:32:09 +0000 (12:32 +0200)]
Moving repositories spec to roles. Added missing spec for project
Dmitriy Zaporozhets [Sat, 15 Dec 2012 09:29:43 +0000 (01:29 -0800)]
Merge pull request #2286 from nuecho/fix-doc-api-issues
Removed delete section in issues API documentation
Riyad Preukschas [Fri, 14 Dec 2012 21:56:06 +0000 (13:56 -0800)]
Merge pull request #2243 from jouve/fix_gfm_username_autocomplete
fix gfm autocomplete for usernames
Matthieu Vachon [Fri, 14 Dec 2012 21:06:02 +0000 (16:06 -0500)]
Removed delete section in issues API documentation
Riyad Preukschas [Fri, 14 Dec 2012 20:12:05 +0000 (21:12 +0100)]
Display namespace for projects in gitlab:check task.
Dmitriy Zaporozhets [Fri, 14 Dec 2012 20:10:02 +0000 (22:10 +0200)]
Merge branch 'feature/note_milestone_events'
Dmitriy Zaporozhets [Fri, 14 Dec 2012 20:05:10 +0000 (22:05 +0200)]
Uncommented test observing comment event
Dmitriy Zaporozhets [Fri, 14 Dec 2012 19:54:49 +0000 (21:54 +0200)]
Fixed event.allowed? with event.proper?
Dmitriy Zaporozhets [Fri, 14 Dec 2012 19:48:16 +0000 (21:48 +0200)]
Fix author_id_of_changes mass assignment
Dmitriy Zaporozhets [Fri, 14 Dec 2012 19:39:55 +0000 (21:39 +0200)]
Processing with note events. reformated dashboard for more events to handle
Riyad Preukschas [Fri, 14 Dec 2012 19:20:26 +0000 (20:20 +0100)]
Update gitlab:check task to use the Gitlab.config.ssh_user setting
Dmitriy Zaporozhets [Fri, 14 Dec 2012 17:33:33 +0000 (19:33 +0200)]
Create events on comments and milestone
Dmitriy Zaporozhets [Fri, 14 Dec 2012 05:34:05 +0000 (08:34 +0300)]
Rework of milestones
Dmitriy Zaporozhets [Fri, 14 Dec 2012 05:14:05 +0000 (08:14 +0300)]
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
Dmitriy Zaporozhets [Fri, 14 Dec 2012 03:14:05 +0000 (06:14 +0300)]
Allow group path renaming. Dont show project transfer if no permissions. More danger messages :)
Dmitriy Zaporozhets [Thu, 13 Dec 2012 19:44:55 +0000 (21:44 +0200)]
bit reordering and cleanup unused styles
Dmitriy Zaporozhets [Thu, 13 Dec 2012 17:20:10 +0000 (19:20 +0200)]
Fix spec/workers/post_receive_spec.rb
Dmitriy Zaporozhets [Thu, 13 Dec 2012 16:42:15 +0000 (18:42 +0200)]
Fix project lookup. Show error if project transfer fails
Dmitriy Zaporozhets [Thu, 13 Dec 2012 15:57:13 +0000 (07:57 -0800)]
Merge pull request #2278 from gravis/patch-1
Update README.md