Dmitriy Zaporozhets
8ec956421c
Merge pull request #1539 from NARKOZ/front-end
...
auto-complete for mentions in notes
2012-09-24 06:02:34 -07:00
Dmitriy Zaporozhets
6667f3dbf9
Colored labels for events
2012-09-24 13:33:51 +03:00
Dmitriy Zaporozhets
d23022c6f6
Working on dashboard restyle and events refactoring
2012-09-24 12:32:51 +03:00
Dmitriy Zaporozhets
fa1f8513d9
Merge branch 'master' into stable
2012-09-24 10:46:38 +03:00
Dmitriy Zaporozhets
a6f58b9c43
Up to v2.9.1
2012-09-24 10:45:55 +03:00
Dmitriy Zaporozhets
1c5cb538f2
Merge branch 'master' into stable
2012-09-24 10:35:59 +03:00
Staicu Ionut
c701507b6c
Removed float on emoji
...
-`remove comment` button will not make the text jump anymore.
2012-09-24 10:06:41 +03:00
Nihad Abbasov
9c75fcbef1
auto complete team member mentions
2012-09-23 09:52:01 -07:00
Nihad Abbasov
80bcba4ee2
install jquery-atwho-rails
2012-09-23 08:53:48 -07:00
Dmitriy Zaporozhets
923eb89c1d
Merge pull request #1528 from tsigo/resque_init
...
Consolidate Resque-related initializers
2012-09-23 02:29:13 -07:00
Robert Speicher
ad3eefdcb8
Minor grammar change
...
[ci skip]
2012-09-22 17:06:30 -04:00
Robert Speicher
6ddbee5d89
Consolidate all Resque-related initializers into "4_resque"
2012-09-22 11:26:22 -04:00
Robert Speicher
2cd0caaf73
Rename 4_resque_queues initializer to 4_resque
2012-09-22 11:20:04 -04:00
Florin Stan
6424fc715b
changed the post-receive hook in order to push the correct repository name when the name contain special characters
2012-09-21 13:02:59 -06:00
Dmitriy Zaporozhets
6dd47c5905
Merge branch 'master' into stable
2012-09-21 15:47:07 +03:00
Dmitriy Zaporozhets
4afb7b7cb7
Merge pull request #1522 from NARKOZ/api
...
API clean up
2012-09-21 05:35:45 -07:00
Nihad Abbasov
bbdb2c3fef
fix links in API README
2012-09-21 05:06:36 -07:00
Nihad Abbasov
4162566e11
separate project repositories API docs
2012-09-21 05:03:50 -07:00
Nihad Abbasov
1304331589
remove commits API section from help
2012-09-21 05:00:20 -07:00
Nihad Abbasov
1bae64d7f6
whitespace
2012-09-21 04:53:13 -07:00
Nihad Abbasov
b62445813d
API: SSH keys belong to user entity
2012-09-21 04:49:28 -07:00
Nihad Abbasov
4a072be2d7
API: commits belong to project repository
2012-09-21 04:34:07 -07:00
Dmitriy Zaporozhets
131553627d
Merge pull request #1521 from NARKOZ/api
...
API for project team members
2012-09-21 04:19:16 -07:00
Nihad Abbasov
25b745271a
add API for project team members
2012-09-21 03:23:17 -07:00
Dmitriy Zaporozhets
10d3a30b25
APi for commits. Better api docs
2012-09-21 13:22:30 +03:00
Dmitriy Zaporozhets
4cc169d3ca
Improve commits compare. Added tags to autocomplete. Dont look for commits if from & to are empty
2012-09-21 11:22:53 +03:00
randx
49fe8fed11
Merge branch 'api'
2012-09-20 19:35:56 +03:00
randx
d12579aa43
Merge branch 'api' of https://github.com/NARKOZ/gitlabhq into api
2012-09-20 19:35:45 +03:00
Nihad Abbasov
a605943d76
fix broken spec
2012-09-20 22:11:15 +06:00
Nihad Abbasov
81aeac46d6
update help section with session API docs
2012-09-20 08:51:26 -07:00
Nihad Abbasov
b08d33f6a9
API: return 401 for invalid session
2012-09-20 08:38:08 -07:00
Nihad Abbasov
3dd940d4cb
API: extend UserLogin entity from UserBasic
2012-09-20 08:36:43 -07:00
Dmitriy Zaporozhets
9aafe77e70
I want be able to get token via api. Used for mobile applications
2012-09-20 17:45:07 +03:00
Nihad Abbasov
37817cc31d
API: expose project id for milestones
2012-09-20 18:38:34 +06:00
Nihad Abbasov
4e1f1e1422
API docs minor formatting fix
...
[ci-skip]
2012-09-20 18:34:07 +06:00
Dmitriy Zaporozhets
f33e1e480e
Let it be v2.9
2012-09-20 13:05:07 +03:00
Dmitriy Zaporozhets
0e524aaea1
Added workaround for github-markup issue with rendering markdown
2012-09-20 13:00:18 +03:00
Dmitriy Zaporozhets
ed899a2f4b
Replace sanitize with escape once
2012-09-20 11:50:22 +03:00
Alex Denisov
e6ce47291b
master merged
2012-09-20 10:25:29 +03:00
randx
6104942438
Sanitize for network graph
2012-09-20 09:06:12 +03:00
Dmitriy Zaporozhets
ae1d9fb46a
Merge pull request #1512 from tsigo/escape_gfm
...
Better escaping of text passed into GFM
2012-09-19 22:45:24 -07:00
Robert Speicher
345c4d2a77
Update gfm so escaped text is still parsed for references
2012-09-19 20:21:35 -04:00
Robert Speicher
ba72c6f683
Escape text passed directly to gfm
2012-09-19 20:21:12 -04:00
Robert Speicher
496f88afe1
Escape text passed to gfm by link_to_gfm
2012-09-19 19:42:26 -04:00
Robert Speicher
01974185a1
Simplify is_within matcher
...
[ci skip]
2012-09-19 12:14:42 -04:00
Caley Woods
e3b149fae6
Update comment in example unicorn config
...
The timeout was changed to 30 and the comment wasn't updated. Also I've seen several reports of this timeout not being long enough for quite a few people. It resulted in me getting a 502 bad gateway from nginx until I upped it. Perhaps could back to the default 60 would be better? I changed mine to 300, running on an AWS micro instance.
2012-09-19 10:27:27 -05:00
Dmitriy Zaporozhets
bf625b7c92
polishing UI a bit. Added footer links for dashboard
2012-09-19 09:14:07 +03:00
Dmitriy Zaporozhets
6d8d32c244
Merge pull request #1496 from tsigo/custom_redis
...
Add initializer for customizing Resque's Redis connection
2012-09-18 22:06:35 -07:00
Robert Speicher
259ca982da
Add docs for customizing Redis, add example file
2012-09-18 21:53:27 -04:00
Robert Speicher
bfed07ee20
Add an initializer to allow custom Resque configs
2012-09-18 21:45:09 -04:00