OSDN Git Service
Riyad Preukschas [Mon, 6 Aug 2012 03:08:22 +0000 (05:08 +0200)]
Update notifications mails and notify specs for GFM
Riyad Preukschas [Mon, 6 Aug 2012 01:16:06 +0000 (03:16 +0200)]
Fix missing @project errors
Riyad Preukschas [Mon, 6 Aug 2012 00:32:17 +0000 (02:32 +0200)]
Fix GFM helper to raise an exception when @project is not set
Riyad Preukschas [Mon, 6 Aug 2012 00:31:16 +0000 (02:31 +0200)]
Fix GFM specs for ids in markdown headings
Riyad Preukschas [Sun, 5 Aug 2012 23:48:20 +0000 (01:48 +0200)]
Merge branch 'master' into gitlab-flavored-markdown
randx [Thu, 2 Aug 2012 12:30:22 +0000 (15:30 +0300)]
Add admin credentials to installation docs
Valeriy Sizov [Sat, 4 Aug 2012 17:30:05 +0000 (10:30 -0700)]
Merge pull request #1147 from miks/master
Add automatic HTML id attributes to markdown headings to allow linking to content sections in wiki
Valeriy Sizov [Sat, 4 Aug 2012 17:17:14 +0000 (10:17 -0700)]
Merge pull request #1184 from karuna/master
Hook url should be able to contain http basic authentication
randx [Thu, 2 Aug 2012 06:48:24 +0000 (09:48 +0300)]
Rack mini profiler for dev env
randx [Sat, 4 Aug 2012 07:13:54 +0000 (10:13 +0300)]
Fix travis script
randx [Thu, 2 Aug 2012 06:07:01 +0000 (09:07 +0300)]
Fix github issue #1190
randx [Thu, 2 Aug 2012 06:05:00 +0000 (09:05 +0300)]
Remove useless Protected branch test
Dmitriy Zaporozhets [Sat, 4 Aug 2012 06:47:58 +0000 (06:47 +0000)]
Merge branch 'tests_cleanup' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Sat, 4 Aug 2012 06:27:31 +0000 (23:27 -0700)]
Merge pull request #1152 from natrim/master
Fix UMASK checking in .gitoliterc
Dmitriy Zaporozhets [Fri, 3 Aug 2012 16:59:55 +0000 (19:59 +0300)]
Comments cucumber. More refactoring. Cucumber -> branches, tags
Dmitriy Zaporozhets [Fri, 3 Aug 2012 16:49:54 +0000 (19:49 +0300)]
Issues cucumber. refactored step_definitoons
Dmitriy Zaporozhets [Fri, 3 Aug 2012 16:39:54 +0000 (19:39 +0300)]
Milestones cucumber. Renamed app security test
Dmitriy Zaporozhets [Fri, 3 Aug 2012 16:29:54 +0000 (19:29 +0300)]
Remove duplicate coverage in spec requests. All features should be covered in cucumber
Valeriy Sizov [Thu, 2 Aug 2012 16:27:10 +0000 (09:27 -0700)]
Merge pull request #1179 from robbytaylor/master
Grammar fix after creating a project
gitlab system [Thu, 2 Aug 2012 02:48:46 +0000 (09:48 +0700)]
make hooks respect http basic authentication
Riyad Preukschas [Thu, 2 Aug 2012 00:31:45 +0000 (02:31 +0200)]
Update views for GFM
Riyad Preukschas [Thu, 2 Aug 2012 00:30:36 +0000 (02:30 +0200)]
Add specs for using GFM on a variety pages
Riyad Preukschas [Thu, 2 Aug 2012 00:29:47 +0000 (02:29 +0200)]
Remove the commit_msg_with_link_to_issues helper and specs
Riyad Preukschas [Thu, 2 Aug 2012 00:29:15 +0000 (02:29 +0200)]
Update Gitlab Markdown renderer to use GFM
Riyad Preukschas [Thu, 2 Aug 2012 00:28:50 +0000 (02:28 +0200)]
Add link_to_gfm helper and specs
Riyad Preukschas [Thu, 2 Aug 2012 00:41:49 +0000 (02:41 +0200)]
Add GFM helper
Riyad Preukschas [Thu, 2 Aug 2012 00:26:21 +0000 (02:26 +0200)]
Add GFM helper specs
tests references to
* commits
* team members
* issues
* merge requests
* snipptes
Riyad Preukschas [Mon, 23 Jul 2012 23:45:08 +0000 (01:45 +0200)]
Add render context to markdown renderer
Nihad Abbasov [Wed, 1 Aug 2012 12:57:56 +0000 (05:57 -0700)]
API: set content type for raw snippet
Nihad Abbasov [Wed, 1 Aug 2012 12:48:15 +0000 (05:48 -0700)]
fix typo according to docs and tests
Rob Taylor [Wed, 1 Aug 2012 10:19:20 +0000 (11:19 +0100)]
Fixed grammar in 'please wait' message after creating project
randx [Sat, 28 Jul 2012 02:43:34 +0000 (05:43 +0300)]
Fixed firefox css bug with issues table
randx [Sat, 28 Jul 2012 00:35:24 +0000 (03:35 +0300)]
Feature: Bulk Issues update
Nihad Abbasov [Wed, 1 Aug 2012 06:37:48 +0000 (23:37 -0700)]
Merge pull request #1157 from CodeAdept/api_blob_contents
API blob contents
Jeremy Anderson [Tue, 31 Jul 2012 14:34:06 +0000 (07:34 -0700)]
fixed typo
Jeremy Anderson [Thu, 26 Jul 2012 14:29:53 +0000 (07:29 -0700)]
updating project api to include raw blob contents and single branch
Dmitriy Zaporozhets [Tue, 31 Jul 2012 05:32:49 +0000 (08:32 +0300)]
Backend Refactoring
Jeremy Anderson [Sat, 28 Jul 2012 02:18:04 +0000 (22:18 -0400)]
Merge remote-tracking branch 'upstream/master'
randx [Fri, 27 Jul 2012 21:42:44 +0000 (00:42 +0300)]
Styled New/Edit Project for admin area
randx [Sun, 29 Jul 2012 17:22:48 +0000 (20:22 +0300)]
Better cucumber coverage for dashboard
randx [Sun, 29 Jul 2012 17:08:58 +0000 (20:08 +0300)]
Better name for Project push methods module
randx [Sun, 29 Jul 2012 09:51:58 +0000 (12:51 +0300)]
Styled Source Browse
randx [Sat, 28 Jul 2012 22:40:21 +0000 (01:40 +0300)]
Team Member Profile: Remove button rebased
randx [Sat, 28 Jul 2012 22:34:51 +0000 (01:34 +0300)]
CSS refactoring. Notes better styled
Dmitriy Zaporozhets [Sat, 28 Jul 2012 14:46:40 +0000 (07:46 -0700)]
Merge pull request #1163 from tomykaira/bug_1009
Fix #1009 Replace all special characters in user's identity
Dmitriy Zaporozhets [Sat, 28 Jul 2012 14:38:17 +0000 (07:38 -0700)]
Merge pull request #983 from JamesEarlDouglas/notify-grammar
cleanup the wording of the notification footer
tomykaira [Sat, 28 Jul 2012 12:59:30 +0000 (21:59 +0900)]
Fix #1009 Replace all special characters in user's identity
randx [Fri, 27 Jul 2012 21:40:14 +0000 (00:40 +0300)]
fix commits spec
randx [Fri, 27 Jul 2012 21:27:54 +0000 (00:27 +0300)]
Better visibility of event commit links & commits ids
randx [Fri, 27 Jul 2012 20:57:42 +0000 (23:57 +0300)]
Fix issue padding cause PR 1144
Dmitriy Zaporozhets [Fri, 27 Jul 2012 20:48:05 +0000 (13:48 -0700)]
Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased
Break up links with nested formating (rebased)
Dmitriy Zaporozhets [Fri, 27 Jul 2012 13:33:03 +0000 (06:33 -0700)]
Merge pull request #1154 from meskyanichi/master
As per request: Post-receive hook should be owned by gitlab user, not git.
Michael van Rooijen [Fri, 27 Jul 2012 13:30:36 +0000 (15:30 +0200)]
Post-receive hook should be owned by gitlab user, not git.
natrim [Fri, 27 Jul 2012 09:03:30 +0000 (12:03 +0300)]
fix checking for right gitolite UMASK
randx [Fri, 27 Jul 2012 08:22:05 +0000 (11:22 +0300)]
commit.short_id as model method. Styled inline comment form
Dmitriy Zaporozhets [Fri, 27 Jul 2012 06:11:46 +0000 (23:11 -0700)]
Merge pull request #1129 from meskyanichi/master
Potential solution for current `rake gitlab:app:backup_restore` issues.
Michael van Rooijen [Sun, 22 Jul 2012 12:48:23 +0000 (14:48 +0200)]
Modified the `repo_dump` and `repo_restore` rake tasks to properly dump and restore repositories based on their `path` rather than their (project) `name`. The project name can be uppercase and may contain spaces. This caused the repository to be restored as a different `path` that it was initially created as, thus, breaking the `git remote` and the web interface can no longer detect the repository either because it searches by `path` and not by `name`. Also, when restoring the permissions are incorrect making it impossible to push new commits to the remote repository. So now on success it'll set the correct permissions (but requires that the `gitlab` user has `sudo` privileges, or this task must be executed as root).
randx [Thu, 26 Jul 2012 13:14:34 +0000 (16:14 +0300)]
Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status
randx [Thu, 26 Jul 2012 11:45:17 +0000 (14:45 +0300)]
Fixed dashboard loader, fixed 404 for reporter on empty wiki page.
Styled Wiki edit page
miks [Thu, 26 Jul 2012 08:47:17 +0000 (11:47 +0300)]
Add automatic HTML id attributes to markdown headings to allow linking
to content sections in wiki
Riyad Preukschas [Mon, 23 Jul 2012 23:22:01 +0000 (01:22 +0200)]
Update links in events
Riyad Preukschas [Sun, 22 Jul 2012 12:36:22 +0000 (14:36 +0200)]
Fix styles
* don't show pointer cursor for for the whole list item any more
* fix hover color for links in .row_title
Riyad Preukschas [Sun, 22 Jul 2012 12:37:46 +0000 (14:37 +0200)]
Update links to milestones
Riyad Preukschas [Sun, 22 Jul 2012 12:33:31 +0000 (14:33 +0200)]
Update links to merge requests
Riyad Preukschas [Sun, 22 Jul 2012 12:33:03 +0000 (14:33 +0200)]
Update links to issues
Riyad Preukschas [Sun, 22 Jul 2012 12:31:42 +0000 (14:31 +0200)]
Update links to commits
randx [Wed, 25 Jul 2012 19:08:47 +0000 (22:08 +0300)]
Styled wiki area. fixed commit feed feature
randx [Wed, 25 Jul 2012 18:45:53 +0000 (21:45 +0300)]
Fix compare crash after decorator refactoring
randx [Wed, 25 Jul 2012 18:38:33 +0000 (21:38 +0300)]
Remove recreated mailer controller for admin
randx [Wed, 25 Jul 2012 18:36:30 +0000 (21:36 +0300)]
Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments
Conflicts:
app/controllers/admin/mailer_controller.rb
app/controllers/notes_controller.rb
Dmitriy Zaporozhets [Wed, 25 Jul 2012 18:25:55 +0000 (11:25 -0700)]
Merge pull request #1127 from riyad/use-decorators
Use CommitDecorator more
Dmitriy Zaporozhets [Wed, 25 Jul 2012 18:22:03 +0000 (11:22 -0700)]
Merge pull request #1133 from robbytaylor/master
Updated merge request subheading.
Dmitriy Zaporozhets [Wed, 25 Jul 2012 18:21:32 +0000 (11:21 -0700)]
Merge pull request #1142 from NARKOZ/api
API changes
Nihad Abbasov [Wed, 25 Jul 2012 12:24:28 +0000 (05:24 -0700)]
return 404 if project not found
Nihad Abbasov [Wed, 25 Jul 2012 11:22:21 +0000 (04:22 -0700)]
API: expose issues project id
Nihad Abbasov [Wed, 25 Jul 2012 09:35:41 +0000 (02:35 -0700)]
API: update docs
Nihad Abbasov [Wed, 25 Jul 2012 09:18:30 +0000 (02:18 -0700)]
API: ability to get project by id
Dmitriy Zaporozhets [Wed, 25 Jul 2012 08:51:06 +0000 (01:51 -0700)]
Merge pull request #1118 from patthoyts/pt/ldap-missing-password
Handle LDAP missing credentials error with a flash message.
Dmitriy Zaporozhets [Wed, 25 Jul 2012 08:50:34 +0000 (01:50 -0700)]
Merge pull request #1122 from patthoyts/pt/missing-log
Create the githost.log file if necessary.
Dmitriy Zaporozhets [Wed, 25 Jul 2012 08:48:00 +0000 (01:48 -0700)]
Merge pull request #1135 from NARKOZ/api
Issues API
Jeremy Anderson [Tue, 24 Jul 2012 18:41:26 +0000 (11:41 -0700)]
updated gitignore and added rake 0.8.7 to Gemfile because of errors
Nihad Abbasov [Tue, 24 Jul 2012 12:52:43 +0000 (05:52 -0700)]
update help section with issues API docs
Nihad Abbasov [Tue, 24 Jul 2012 12:46:36 +0000 (05:46 -0700)]
Merge branch 'master' into api
Nihad Abbasov [Tue, 24 Jul 2012 12:25:01 +0000 (05:25 -0700)]
update API docs
Nihad Abbasov [Tue, 24 Jul 2012 12:19:51 +0000 (05:19 -0700)]
add issues API
Rob Taylor [Tue, 24 Jul 2012 10:22:13 +0000 (11:22 +0100)]
Updated merge request subheading.
Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.
Riyad Preukschas [Sun, 22 Jul 2012 11:08:32 +0000 (13:08 +0200)]
Update specs
Riyad Preukschas [Sun, 22 Jul 2012 11:08:24 +0000 (13:08 +0200)]
Update views to use CommitDecorator
Riyad Preukschas [Sat, 21 Jul 2012 17:37:31 +0000 (19:37 +0200)]
Add CommitDecorator#short_id
Pat Thoyts [Sat, 21 Jul 2012 14:30:09 +0000 (15:30 +0100)]
Create the githost.log file if necessary.
This resolves issue #1121.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Pat Thoyts [Sat, 21 Jul 2012 08:04:05 +0000 (09:04 +0100)]
Handle LDAP missing credentials error with a flash message.
If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.
The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit
f322975.
This resolves issue #1077.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
randx [Sat, 21 Jul 2012 07:53:55 +0000 (10:53 +0300)]
Up to 2.7.0
randx [Sat, 21 Jul 2012 07:47:57 +0000 (10:47 +0300)]
Help section for system hooks completed
randx [Sat, 21 Jul 2012 07:32:42 +0000 (10:32 +0300)]
Fix system hook example
randx [Sat, 21 Jul 2012 07:27:09 +0000 (10:27 +0300)]
move SSH keys tab closer to begining
randx [Sat, 21 Jul 2012 07:23:05 +0000 (10:23 +0300)]
Endless event loading for dsahboard
Dmitriy Zaporozhets [Fri, 20 Jul 2012 21:23:49 +0000 (14:23 -0700)]
Merge pull request #1117 from patthoyts/pt/user-form
Fix english on the edit user form.
Pat Thoyts [Tue, 17 Jul 2012 23:11:51 +0000 (00:11 +0100)]
Fix english on the edit user form.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Ian Morgan [Fri, 20 Jul 2012 17:16:19 +0000 (13:16 -0400)]
Show wiki comments for all revisions
Dmitriy Zaporozhets [Fri, 20 Jul 2012 14:24:56 +0000 (14:24 +0000)]
Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq