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#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
randx
9c8a1e6517
Fix system hook example
2012-07-21 10:32:42 +03:00
randx
4261acda90
move SSH keys tab closer to begining
2012-07-21 10:27:09 +03:00
randx
a69fc5dd23
Endless event loading for dsahboard
2012-07-21 10:23:05 +03:00
Dmitriy Zaporozhets
860fa1163a
Merge pull request #1117 from patthoyts/pt/user-form
...
Fix english on the edit user form.
2012-07-20 14:23:49 -07:00
Pat Thoyts
787e5e94ac
Fix english on the edit user form.
...
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-07-20 22:18:42 +01:00
Ian Morgan
04a85f4582
Show wiki comments for all revisions
2012-07-20 13:16:19 -04:00
Dmitriy Zaporozhets
9267cb04b0
Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq
2012-07-20 14:24:56 +00:00
Dmitriy Zaporozhets
791208431c
Box shadow for boxes
2012-07-20 08:39:34 +03:00
Dmitriy Zaporozhets
3c6daec4b1
Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq
2012-07-20 09:08:16 +00:00
Dmitriy Zaporozhets
60ee383eb9
Enable observe for system hooks
2012-07-20 12:08:59 +03:00
Dmitriy Zaporozhets
3063af5adc
BaseContext
...
Controllers refactoring with contexts
Move commit compare logic to model
2012-07-20 08:39:34 +03:00
Ian Morgan
36efa2042c
Add comments to Wiki pages
2012-07-19 20:23:55 -04:00
Valeriy Sizov
d9cd6269e9
System Hooks: move callback to observer
2012-07-20 01:01:29 +03:00
gliptak
44ec5579bd
Display configured git repository location on error page (this is partially addressing issue #1072 )
2012-07-19 12:39:02 -03:00
Dmitriy Zaporozhets
1464952597
Fix comments in MR. Fixed event destroy with user
2012-07-19 07:05:57 +03:00
Dmitriy Zaporozhets
214fdd2d2f
Ignore backups dir
2012-07-19 12:52:28 +03:00
Dmitriy Zaporozhets
30eee67726
Merge pull request #1106 from mrichardson-shelter/backup-create-fix-mysql-syntax-error
...
Fixing MySQL syntax error
2012-07-19 02:46:14 -07:00
Valeriy Sizov
86bd11cbd8
System Hooks: rspec
2012-07-19 00:25:10 +03:00
Valeriy Sizov
655418bed2
System hooks: fix broken tests
2012-07-19 00:25:10 +03:00
Valeriy Sizov
f5908cef19
System Hook: implemented
2012-07-19 00:25:10 +03:00
Valeriy Sizov
c38578428b
System Hooks: CRUD has done
2012-07-19 00:25:10 +03:00
Valeriy Sizov
65dc68b35c
Refactoring of hook functionality & bootsrap system hooks
2012-07-19 00:25:10 +03:00
Valeriy Sizov
72a571724d
Merge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project
...
show flash notice after deletion of a project
2012-07-18 05:35:42 -07:00
Valeriy Sizov
3ac840ff06
Merge pull request #1100 from patthoyts/pt/ldap-no-email
...
Improve handling of misconfigured LDAP accounts.
2012-07-18 05:17:14 -07:00
