Dmitriy Zaporozhets
fd1b9fdc12
Merge branch 'extend_user_api' of https://github.com/bladealslayer/gitlabhq into bladealslayer-extend_user_api
...
Conflicts:
spec/requests/api/users_spec.rb
2013-01-31 13:00:50 +02:00
Dmitriy Zaporozhets
afdb09de80
Merge pull request #2711 from fbehrens/patch-1
...
Update config/database.yml.postgresql
2013-01-31 02:54:48 -08:00
Dmitriy Zaporozhets
56000aea22
Merge pull request #2855 from hiroponz/fix-bug-of-network-graph
...
Fix bug of network graph(#2847 ) and trivial code clean up.
2013-01-31 02:33:59 -08:00
Dmitriy Zaporozhets
2af323bbd1
fix active tabs tests
2013-01-31 12:08:56 +02:00
Dmitriy Zaporozhets
130f60d55b
a bit of restyling. Replace some images with icons. Simplify note form
2013-01-31 11:22:06 +02:00
Sato Hiroyuki
4133221200
Fix bug of network graph( #2847 ) and trivial code clean up.
2013-01-31 17:48:51 +09:00
Dmitriy Zaporozhets
315fd7d746
fix routing specs
2013-01-31 10:08:20 +02:00
Dmitriy Zaporozhets
193a5624b2
add path and path_with_namespace to api project entity
2013-01-31 09:11:35 +02:00
Dmitriy Zaporozhets
563c55eb7e
fix pagination issue
2013-01-31 08:55:31 +02:00
Dmitriy Zaporozhets
bcc0eed3e4
missing doc for api
2013-01-31 08:46:59 +02:00
Dmitriy Zaporozhets
9da7b2e8d8
add specs for api -> merge request notes
2013-01-31 08:42:11 +02:00
Dmitriy Zaporozhets
a037c9c249
Merge pull request #2842 from inome/ExposeMergeRequestAsNotable
...
Expose MergeRequest object as a notable in the API to allow for easy ret...
2013-01-30 22:25:02 -08:00
Dmitriy Zaporozhets
6dff742b66
Merge pull request #2852 from hiroponz/displaying-commit-on-new-window
...
Displaying commit on a new window, when clicking commit on network graph.
2013-01-30 22:23:33 -08:00
Dmitriy Zaporozhets
d46cb3fd1c
Merge pull request #2847 from hiroponz/improve-overlap-lines
...
Improve overlap of lines in network graph
2013-01-30 22:22:37 -08:00
Dmitriy Zaporozhets
8c50707dd4
Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph
...
Switchable the main branch on network graph
2013-01-30 22:21:19 -08:00
Sato Hiroyuki
ad33c39800
Fix wrong path of features.
2013-01-31 13:22:08 +09:00
Sato Hiroyuki
f8a2db5341
Displaying commit on a new window, when clicking commit on network graph.
2013-01-31 10:43:57 +09:00
Dmitriy Zaporozhets
1fdeb9e030
Merge branch 'refactor/css' of dev.gitlabhq.com:gitlab/gitlabhq
2013-01-30 17:28:48 +00:00
Dmitriy Zaporozhets
bfd00caff3
Few usability improvments
2013-01-30 17:13:05 +02:00
Dmitriy Zaporozhets
560985b0f6
Fixed link_to_member
2013-01-30 17:07:44 +02:00
Dmitriy Zaporozhets
b096ee3275
a bit of split up for gitlab-bootstrap
2013-01-30 17:01:58 +02:00
Dmitriy Zaporozhets
b742f47e89
remove old alert messages
2013-01-30 16:53:18 +02:00
Sato Hiroyuki
59b6de93ce
Improve overlap of lines in network graph
2013-01-30 23:48:00 +09:00
Dmitriy Zaporozhets
e2fb18a3ec
replace right with pull-right
2013-01-30 16:40:43 +02:00
Dmitriy Zaporozhets
7d593c5446
Merge pull request #2837 from xudiera/master
...
Fixed a grammar mistake in alert-message.block-message
2013-01-30 06:32:02 -08:00
Micah Huff
1694dc8fe2
Expose MergeRequest object as a notable in the API to allow for easy retrieval of comments
2013-01-29 21:15:13 -08:00
Sato Hiroyuki
525a8cd3e9
Switchable the main branch on network graph
2013-01-30 09:12:03 +09:00
Dmitriy Zaporozhets
7ba4f2dcfa
few styling for buttons
2013-01-29 22:57:15 +02:00
Dmitriy Zaporozhets
fb617c61b9
refactor buttons pt2
2013-01-29 22:29:21 +02:00
Dmitriy Zaporozhets
033aa1a885
refactor buttons pt1
2013-01-29 22:18:19 +02:00
Carlos Xudiera
cdd5543173
Fixed a grammar mistake in alert-message.block-message
2013-01-29 12:58:34 -05:00
Dmitriy Zaporozhets
9fdbdc662a
set link to gitlab-ci
2013-01-29 14:49:10 +02:00
Dmitriy Zaporozhets
c84675ee06
satellites logs
2013-01-29 12:12:24 +02:00
Dmitriy Zaporozhets
7121a58eb9
Advanced logging for post-receive worker
2013-01-29 11:32:05 +02:00
Dmitriy Zaporozhets
f72dc7f779
dont escape images inside links for gfm. Fixes #2701
2013-01-29 11:00:56 +02:00
Dmitriy Zaporozhets
1c931fb814
fix key observer tests
2013-01-28 23:03:38 +02:00
Dmitriy Zaporozhets
299a9a1040
keys to gitolite via sidekiq now
2013-01-28 21:02:10 +02:00
Dmitriy Zaporozhets
944b2450b1
Merge pull request #2801 from Takuto88/master
...
Fix #2790
2013-01-28 10:33:59 -08:00
Dmitriy Zaporozhets
df6db81e2a
Merge branch 'features/async_gitolite' of dev.gitlabhq.com:gitlab/gitlabhq
2013-01-28 15:54:31 +00:00
Dmitriy Zaporozhets
f7ade3b682
fix tests
2013-01-28 17:53:01 +02:00
Dmitriy Zaporozhets
9ad5fbb416
user factory username over sequence
2013-01-28 17:46:24 +02:00
Dmitriy Zaporozhets
8b54b7233e
Async perform for add/remove team members
2013-01-28 17:39:02 +02:00
Dmitriy Zaporozhets
1c5876eb7b
Do gitolite calls async. Remove satellite with project remove
2013-01-28 17:22:45 +02:00
Lennart Rosam
f9a48f72d4
Fix issue #2790
2013-01-28 13:52:30 +01:00
Riyad Preukschas
b4f16faafd
Merge pull request #2798 from Xylakant/patch-2
...
remove incorrect information about the api version
2013-01-28 04:47:00 -08:00
Lennart Rosam
66ebf8d83f
Merge remote-tracking branch 'github/master'
2013-01-28 13:04:23 +01:00
Lennart Rosam
dc13af90b1
Fix rake task - Update method name
2013-01-28 12:54:07 +01:00
Felix Gilcher
3c47e6248a
remove incorrect information about the api version
...
The API version is currently not equal to the gitlab major version number. Gitlab 4.1
still uses API version 3. Point to the lib/api.rb file instead which contains the
autoritative information.
2013-01-28 10:59:39 +01:00
Dmitriy Zaporozhets
bd94854929
fix tests
2013-01-28 08:59:34 +02:00
Dmitriy Zaporozhets
e0b5e26035
Merge pull request #2153 from koenpunt/commit-diff-views
...
Added swipe view for image diff
2013-01-27 11:41:23 -08:00
