Dmitriy Zaporozhets
21c141afb1
Merge branch 'notes_refactoring'
2012-02-24 22:39:51 +02:00
Dmitriy Zaporozhets
292a41cbe2
Fixed comments for snippets. Tests fixed
2012-02-24 22:36:44 +02:00
Dmitriy Zaporozhets
d41d8ffb02
Reply button, Comments for Merge Request diff
2012-02-24 22:19:47 +02:00
Dmitriy Zaporozhets
b1a36b552b
Merge pull request #466 from skroutz/no-rbenv
...
Don't enforce rbenv version
2012-02-24 07:41:14 -08:00
Dmitriy Zaporozhets
db75dae913
Merge pull request #465 from skroutz/branches_commit_link
...
Fix broken commit link in branches page
2012-02-24 07:40:38 -08:00
Christos Trochalakis
75f040fbfe
Don't enforce rbenv version
...
It would be better not include either rbenv or a specific rbenv version
with gitlab.
2012-02-24 17:39:14 +02:00
Christos Trochalakis
e42fb4fda4
Fix broken commit link in branches page
2012-02-24 17:27:44 +02:00
Dmitriy Zaporozhets
215a01f63c
move notes login to one controller
2012-02-24 09:16:06 +02:00
Dmitriy Zaporozhets
81092c0198
Status codes for errors, New error pages
2012-02-23 21:04:20 +02:00
Pat Thoyts
2be4fe2858
Generate consistent gravatar hash values as per documentation.
...
The gravatar documentation on implementing the hash specifies that leading
and trailing whitespace must be trimmed and all characters should be forced
to lowercase.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-02-23 16:07:54 +00:00
Dmitriy Zaporozhets
9e6d0710e9
Merge pull request #443 from CedricGatay/fix/incorrectLineNumberingInDiff
...
Incorrect line numbering in diff
2012-02-22 07:14:54 -08:00
Cedric Gatay
6ea87c47f0
Incorrect line numbering in diff
...
When displaying a diff, the line number always starts at one, even if the first diff is not at the first line
Fixes this to display correct line numbering on first diff
2012-02-22 16:04:41 +01:00
Dmitriy Zaporozhets
7d279f9302
better error handling for not found resource, gitolite error
2012-02-22 07:14:54 +02:00
Dmitriy Zaporozhets
8c40aab120
Abilities extended. Resources security improved
2012-02-22 00:31:18 +02:00
Dmitriy Zaporozhets
af82b6773b
btn padded class
2012-02-21 23:09:46 +02:00
Dmitriy Zaporozhets
fb17234b05
separated buttons for sidebar
2012-02-21 22:51:18 +02:00
Dmitriy Zaporozhets
9803e0885e
Project sidebar improved
2012-02-21 22:46:34 +02:00
Dmitriy Zaporozhets
1c22d4f50f
Help message for wiki, styled projects page
2012-02-21 22:04:01 +02:00
Dmitriy Zaporozhets
ce8eba8913
Merge branch 'wiki'
...
Conflicts:
app/views/layouts/_project_menu.html.haml
2012-02-21 20:32:43 +02:00
vsizov
621bfdb4aa
wiki: rspec
2012-02-21 20:18:06 +03:00
Dmitriy Zaporozhets
5c492a7089
make issue, commit row title color lighter
2012-02-20 21:50:11 +02:00
Dmitriy Zaporozhets
29c41e9a0e
pollishing UI
2012-02-20 21:38:59 +02:00
Dmitriy Zaporozhets
6a445b4200
fixed forgot password form
2012-02-20 20:37:37 +02:00
Dmitriy Zaporozhets
49d58492f2
Wiki abilities
2012-02-20 21:16:55 +03:00
Dmitriy Zaporozhets
22f4c1908d
Some css fixes
2012-02-20 20:04:03 +02:00
Dmitriy Zaporozhets
3a33795f2b
css shadow for some components
2012-02-20 19:59:39 +02:00
vsizov
bdc42488e9
wiki is done
2012-02-20 20:16:55 +03:00
Dmitriy Zaporozhets
5f4a7c3e04
Home tab added, Repository tab removed\n Ability to download branch
2012-02-20 08:38:03 +02:00
Dmitriy Zaporozhets
40ac2ebc21
fixed bug with branch/commit detection in select
2012-02-20 10:38:03 +02:00
Valery Sizov
2e1f119f22
wiki: markdown support
2012-02-19 22:19:31 +02:00
Valery Sizov
d68f8401b3
wiki: improve history
2012-02-19 21:56:18 +02:00
Valery Sizov
85974948e7
Wiki: history
2012-02-19 21:52:05 +02:00
Dmitriy Zaporozhets
313d96e42b
fixed mr counter for main menu
2012-02-19 21:34:59 +02:00
Dmitriy Zaporozhets
635d3e09b7
Issues, Merge Requests counters
2012-02-19 21:30:31 +02:00
Valery Sizov
b565cd1972
Wiki: fixed main menu
2012-02-19 21:16:29 +02:00
Valery Sizov
40ce6c9131
Wiki: remove notice line
2012-02-19 19:55:37 +02:00
Valery Sizov
12ea84fe46
fix shema after rebase
2012-02-19 19:54:00 +02:00
Valery Sizov
57271da612
Wiki: design fixed
2012-02-19 19:50:13 +02:00
Valery Sizov
4c1b8558df
Wiki: base implemetation logic
2012-02-19 19:50:13 +02:00
Valery Sizov
eacea15a21
wiki base sceleton
2012-02-19 19:50:13 +02:00
Dmitriy Zaporozhets
df27ec29f3
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
2012-02-19 16:31:17 +02:00
Dmitriy Zaporozhets
2e83de1924
fixed layout for ipad
2012-02-19 16:31:11 +02:00
Valeriy Sizov
a44b85be9e
Merge pull request #422 from steveprentice/master
...
This makes gitlabhq compatible with more LDAP servers (specifically OpenLDAP).
2012-02-19 03:45:55 -08:00
Dmitriy Zaporozhets
ee45a49c57
preparing to v2.2
2012-02-19 12:36:16 +02:00
Dmitriy Zaporozhets
a6870dd08f
fix travis after config rename
2012-02-19 11:49:48 +02:00
Dmitriy Zaporozhets
9edbac5ac8
Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into artiom-config-examples
...
Conflicts:
.gitignore
2012-02-19 11:39:28 +02:00
Dmitriy Zaporozhets
a84a929428
Merge pull request #426 from RLovelett/resque-update
...
Fixes :public Warning In Resque When Running Any Rails Command
2012-02-19 01:34:58 -08:00
Ryan Lovelett
4748ae8c8c
Fixes the issue with Resque where it was complaining about :public no longer being used.
2012-02-18 09:37:58 -06:00
Dmitriy Zaporozhets
3f91da6816
Fixed widget counts, improved styles
2012-02-18 15:59:01 +02:00
Dmitriy Zaporozhets
fa7bd43ab9
How to merge instructions
2012-02-18 14:43:35 +02:00
