Robert Speicher
2c128f3874
Remove rails-footnotes gem and its related files
2012-08-23 19:20:28 -04:00
Dmitriy Zaporozhets
4b2e151fc6
Merge pull request #1283 from riyad/improve-gfm-code-docs
...
Improve GFM code documentation
2012-08-23 12:06:03 -07:00
Riyad Preukschas
32ae7fb616
Improve GFM code documentation
2012-08-23 20:10:06 +02:00
Dmitriy Zaporozhets
0e5dbd1caf
Merge pull request #1231 from NARKOZ/preview_notes
...
Preview window is not closed after post
2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets
07fe78b323
Merge pull request #1275 from tsigo/no_ci_simplecov
...
Don't run SimpleCov on Travis
2012-08-23 04:26:22 -07:00
Robert Speicher
db4c3e58bc
Don't run SimpleCov on Travis
2012-08-23 07:24:25 -04:00
Dmitriy Zaporozhets
ed2b53cd1c
Up to 2.8.1
2012-08-23 09:17:18 +03:00
Dmitriy Zaporozhets
7ab587a477
Merge pull request #1263 from dosire/merge_base_for_merge_request
...
Show only the commits that are newer in the merge request.
2012-08-23 00:32:37 -07:00
Dmitriy Zaporozhets
a94b2d1ccf
Fix meta gem version
2012-08-23 08:28:00 +03:00
Dmitriy Zaporozhets
6428d4dd63
gitlab_meta gem added
2012-08-23 08:15:30 +03:00
Dmitriy Zaporozhets
1ef1a4ae6e
Merge pull request #1239 from tsigo/disable_gravatar
...
Allow disabling Gravatars in gitlab.yml settings
2012-08-22 04:33:50 -07:00
Dmitriy Zaporozhets
aa50408ecb
1. Better message if no ssh key
...
2. SSH Keys Help page
2012-08-22 03:56:53 +03:00
Dmitriy Zaporozhets
5c7ed6fa26
Up to 2.8
2012-08-22 01:15:26 +03:00
Sytse Sijbrandij
9ec4c2d214
Show only the commits that are newer in the merge request.
2012-08-21 23:07:11 +02:00
randx
d1daeba173
Updated app:status & docs with hooks. Removed write_hooks from app:setup
2012-08-21 22:45:14 +03:00
Dmitriy Zaporozhets
d862ebd3b3
Merge pull request #1266 from tsigo/cucumber_speedup
...
Speed up the "Project Network Graph" cucumber feature
2012-08-21 23:27:03 -07:00
Robert Speicher
6baf9c441d
Fix cucumber failure that only happened on Travis
2012-08-21 22:48:15 -04:00
Robert Speicher
3095483e65
Speed up the "Project Network Graph" cucumber feature
...
This change involves stubbing out the call to `Grit::Commit.find_all`
and limiting the number of commits to 10 vs. the standard of 650 used by
`Gitlab::GraphCommit.to_graph`.
Prior to this change, this single feature required almost 3 minutes of
running time and over 2 GB of memory on my machine. Now it takes less
than 3 seconds.
2012-08-21 22:27:06 -04:00
randx
3784f134f1
Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify
2012-08-21 21:34:33 +03:00
randx
f088eaa972
Refactoring & minor css changes
2012-08-21 21:26:56 +03:00
randx
7fa6a23416
Better fonts for all code like wiki etc
2012-08-21 20:53:33 +03:00
randx
64f3682feb
project should not respond to write_hooks any more
2012-08-21 20:24:04 +03:00
randx
c625293b99
Handle post-receive files via gitolite, not gitlab
2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets
2e7ca8c866
Show only tm events related to this project
2012-08-21 08:20:11 +03:00
randx
366c0065c4
Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap
...
Conflicts:
app/models/user.rb
2012-08-21 08:39:23 +03:00
Robert Speicher
c5b13cc989
Remove more duplication in the Notify mailer
2012-08-20 23:18:57 -04:00
Robert Speicher
652d955c92
Remove some duplication in the Notify mailer
2012-08-20 23:04:53 -04:00
randx
b2b88b2ff2
Added font for head panel. Major restyle for header
2012-08-20 22:51:37 +03:00
Jakub Jirutka
335b3ed197
fix condition in find_for_ldap_auth
2012-08-20 12:58:03 +02:00
randx
ccdea8b80d
Fix dashboard random test fail
2012-08-19 12:14:36 +03:00
randx
8e3a2def8a
Project /lib cleanup
2012-08-19 11:44:48 +03:00
randx
d656cb74f7
Headless gem added
2012-08-19 11:36:37 +03:00
randx
d4059ac966
Move graph_commit under gitlab module
2012-08-19 10:58:10 +03:00
randx
05c86fb0fc
Specify charlock holmes version in installation docs
2012-08-19 10:20:42 +03:00
randx
8eaead6a01
Text message for mergeing MR
2012-08-19 00:45:46 +03:00
randx
7530fa9dec
Restored margin for text in notes
2012-08-19 00:08:20 +03:00
randx
3f9749dd86
Fix branch selector. Few css fixed also
2012-08-18 23:53:58 +03:00
Dmitriy Zaporozhets
93401ef988
Few css improvements
2012-08-17 09:26:59 +03:00
Dmitriy Zaporozhets
813814f02e
Application cleanup
2012-08-17 09:09:11 +03:00
Dmitriy Zaporozhets
4ce034ca65
Merge pull request #1247 from tsigo/feature/no_milestone_filter
...
Allow filtering issues that have no milestone or assignee
2012-08-16 22:33:56 -07:00
Robert Speicher
feee3838e1
Combine unassigned_issue and unassigned_milestone into unassigned_filter
2012-08-16 18:13:22 -04:00
Dmitriy Zaporozhets
b2c6ba97a2
Merge pull request #1230 from tsigo/hooray_apostrophes
...
Correct usage of "Can't"
2012-08-16 14:11:08 -07:00
Robert Speicher
66399d558d
Merge branch 'master' into hooray_apostrophes
2012-08-16 14:03:06 -04:00
Dmitriy Zaporozhets
05da3801f5
Restyled erros pages & avatar class
2012-08-16 09:13:50 +03:00
Robert Speicher
65bcc41f3e
Allow disabling Gravatars in gitlab.yml settings
...
Closes #1237
2012-08-15 21:06:08 -04:00
Dmitriy Zaporozhets
17948951ff
Merge pull request #1234 from studiofrenetic/fix-admin-hook-tab
...
Fix current class for hooks tab in admin section
2012-08-15 00:08:57 -07:00
Martin Bastien
6641761e5c
Fix current class for hooks tab in admin section
...
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
2012-08-15 00:03:13 -04:00
Robert Speicher
70174a1e1a
More minor translation/grammar fixes on error pages
2012-08-14 17:26:38 -04:00
Dmitriy Zaporozhets
0456dd72e2
Merge pull request #1232 from tsigo/refactor_gfm
...
GFM Refactoring
2012-08-14 04:44:02 -07:00
Robert Speicher
b039a16946
GFM refactor: Move the actual parsing to a class under the Gitlab module
2012-08-14 04:37:18 -04:00
