Commit graph

1976 commits

Author SHA1 Message Date
Jeremy Anderson 69c4cea65a updating project api to include raw blob contents and single branch 2012-07-31 07:32:44 -07:00
Dmitriy Zaporozhets 5926bbac12 Backend Refactoring 2012-07-31 08:32:49 +03:00
Jeremy Anderson e6edaa3b50 Merge remote-tracking branch 'upstream/master' 2012-07-27 22:18:04 -04:00
randx 69e41250d1 Styled New/Edit Project for admin area 2012-07-28 00:42:44 +03:00
randx 3caf0aa89a fix commits spec 2012-07-28 00:40:14 +03:00
randx bc7897180d Better visibility of event commit links & commits ids 2012-07-28 00:27:54 +03:00
randx 9a709f76be Fix issue padding cause PR 1144 2012-07-27 23:57:42 +03:00
Dmitriy Zaporozhets f69049c282 Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased
Break up links with nested formating (rebased)
2012-07-27 13:48:05 -07:00
Dmitriy Zaporozhets 34e3327357 Merge pull request #1154 from meskyanichi/master
As per request: Post-receive hook should be owned by gitlab user, not git.
2012-07-27 06:33:03 -07:00
Michael van Rooijen 19f7b038cb Post-receive hook should be owned by gitlab user, not git. 2012-07-27 15:30:36 +02:00
natrim 5cb47b761c fix checking for right gitolite UMASK 2012-07-27 12:03:30 +03:00
randx 0590aa9d60 commit.short_id as model method. Styled inline comment form 2012-07-27 11:22:05 +03:00
Dmitriy Zaporozhets 67ef96ea5f Merge pull request #1129 from meskyanichi/master
Potential solution for current `rake gitlab:app:backup_restore` issues.
2012-07-26 23:11:46 -07:00
Michael van Rooijen ec01cbef94 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). 2012-07-26 21:30:10 +02:00
randx 18f83016b1 Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status 2012-07-26 16:14:34 +03:00
randx c27105f8c3 Fixed dashboard loader, fixed 404 for reporter on empty wiki page.
Styled Wiki edit page
2012-07-26 14:45:17 +03:00
miks 1127c98490 Add automatic HTML id attributes to markdown headings to allow linking
to content sections in wiki
2012-07-26 11:47:17 +03:00
Riyad Preukschas f6a67ef207 Update links in events 2012-07-25 22:27:25 +03:00
Riyad Preukschas 6fc6833cdb Fix styles
* don't show pointer cursor for for the whole list item any more
* fix hover color for links in .row_title
2012-07-25 21:11:58 +02:00
Riyad Preukschas 0aee7c94d0 Update links to milestones 2012-07-25 21:11:58 +02:00
Riyad Preukschas e6bb4f1491 Update links to merge requests 2012-07-25 21:11:58 +02:00
Riyad Preukschas 73dabcb357 Update links to issues 2012-07-25 21:11:58 +02:00
Riyad Preukschas cbce4528d0 Update links to commits 2012-07-25 21:11:58 +02:00
randx 14c9723724 Styled wiki area. fixed commit feed feature 2012-07-25 22:08:47 +03:00
randx 501ca8e6e8 Fix compare crash after decorator refactoring 2012-07-25 21:45:53 +03:00
randx 0296121f08 Remove recreated mailer controller for admin 2012-07-25 21:38:33 +03:00
randx 61c85332d2 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
2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets 5133541f25 Merge pull request #1127 from riyad/use-decorators
Use CommitDecorator more
2012-07-25 11:25:55 -07:00
Dmitriy Zaporozhets 05848512bf Merge pull request #1133 from robbytaylor/master
Updated merge request subheading.
2012-07-25 11:22:03 -07:00
Dmitriy Zaporozhets f9c6d8a45b Merge pull request #1142 from NARKOZ/api
API changes
2012-07-25 11:21:32 -07:00
Nihad Abbasov cb32e0320a return 404 if project not found 2012-07-25 05:24:28 -07:00
Nihad Abbasov f7dd067490 API: expose issues project id 2012-07-25 04:22:21 -07:00
Nihad Abbasov 949b1df930 API: update docs 2012-07-25 02:35:41 -07:00
Nihad Abbasov 1b95c8bff3 API: ability to get project by id 2012-07-25 02:18:30 -07:00
Dmitriy Zaporozhets 92d98f5a0c Merge pull request #1118 from patthoyts/pt/ldap-missing-password
Handle LDAP missing credentials error with a flash message.
2012-07-25 01:51:06 -07:00
Dmitriy Zaporozhets 60d3e94874 Merge pull request #1122 from patthoyts/pt/missing-log
Create the githost.log file if necessary.
2012-07-25 01:50:34 -07:00
Dmitriy Zaporozhets b683a71aa1 Merge pull request #1135 from NARKOZ/api
Issues API
2012-07-25 01:48:00 -07:00
Jeremy Anderson 0301ba3315 updated gitignore and added rake 0.8.7 to Gemfile because of errors 2012-07-24 11:41:26 -07:00
Nihad Abbasov fbb41100db update help section with issues API docs 2012-07-24 05:52:43 -07:00
Nihad Abbasov eca823c1c7 Merge branch 'master' into api 2012-07-24 05:46:36 -07:00
Nihad Abbasov 024e034890 update API docs 2012-07-24 05:25:01 -07:00
Nihad Abbasov 7b33d8cbca add issues API 2012-07-24 05:19:51 -07:00
Rob Taylor dce6f7beb4 Updated merge request subheading.
Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.
2012-07-24 11:22:13 +01:00
Riyad Preukschas f9877c529e Update specs 2012-07-22 13:08:32 +02:00
Riyad Preukschas 34cea1cb63 Update views to use CommitDecorator 2012-07-22 13:08:24 +02:00
Riyad Preukschas ff40b7de7a Add CommitDecorator#short_id 2012-07-21 19:59:55 +02:00
Pat Thoyts 6035ad7e1f Create the githost.log file if necessary.
This resolves issue #1121.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-21 15:32:04 +01:00
Pat Thoyts a2d244ec06 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>
2012-07-21 09:04:05 +01:00
randx 8b7e404b5b Up to 2.7.0 2012-07-21 10:53:55 +03:00
randx 11721b0dbe Help section for system hooks completed 2012-07-21 10:47:57 +03:00