Dmitriy Zaporozhets
faafde2d2b
Fix new password page UI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-11 09:37:55 +02:00
Dmitriy Zaporozhets
1af84f8ceb
Merge branch 'feature/blob_last_commit' into 'master'
...
Feature: show last commit for Blob#show
Fixes #970
2014-02-10 20:57:43 +00:00
Dmitriy Zaporozhets
9a3d665919
Show last commit for Blob#show
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 21:46:46 +02:00
Dmitriy Zaporozhets
35fb7d5408
Merge pull request #6276 from robertd/update_changelog
...
Update changelog for #6267
2014-02-10 21:09:53 +02:00
Dmitriy Zaporozhets
657eb7ba93
Merge branch 'bug/filtering_service' into 'master'
...
Fix wrong issues appears at Dashboard#issues page
Fixes #1028
2014-02-10 18:52:08 +00:00
Dmitriy Zaporozhets
c10a35c4ad
Merge branch 'ace_editor' into 'master'
...
Ace Editor as gem
2014-02-10 17:12:49 +00:00
Dmitriy Zaporozhets
5e30f4d54c
Fix dashboard atom feed
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 17:32:36 +02:00
Dmitriy Zaporozhets
1794f606bd
Use ace editor as gem
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 16:18:46 +02:00
Dmitriy Zaporozhets
baf8afc6d3
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-02-10 15:38:53 +02:00
Dmitriy Zaporozhets
8342f73de8
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-02-10 15:38:44 +02:00
Sytse Sijbrandij
6cf24ba9d7
Merge pull request #6284 from Razer6/fix_grammer_in_mr_page
...
Fixes #6073 , Update grammer in MR accept form
2014-02-10 14:38:04 +01:00
Sytse Sijbrandij
189ae623ca
Merge pull request #6283 from Razer6/fix_dead_links
...
Fixes #6187 , Update dead links
2014-02-10 14:37:32 +01:00
Dmitriy Zaporozhets
58ac731c37
Fix Issues#bulk_update
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 15:36:58 +02:00
Dmitriy Zaporozhets
ec437ad999
Add more tests for FilteringService
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 15:23:19 +02:00
Sytse Sijbrandij
62778fa758
Merge branch 'sockets_are_standard' into 'master'
...
Sockets Are Standard
2014-02-10 13:06:24 +00:00
Dmitriy Zaporozhets
56f989e53e
Fix wrong issues appears at Dashboard#issues page
...
Filtering service used klass instead of passed items.
Because of this you see list of all issues intead of authorized ones.
This commit fixes it so people see only issues they are authorized to
see.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 15:04:52 +02:00
Jacob Vosmaer
464d820bc5
Domain sockets are the default, not TCP
2014-02-10 14:01:15 +01:00
Jacob Vosmaer
e009e0203e
Use one sentence per line in architecture.md
2014-02-10 13:59:30 +01:00
Dmitriy Zaporozhets
5a098e84e4
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-02-10 13:03:24 +02:00
Dmitriy Zaporozhets
05ab4d8ba3
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-02-10 13:02:53 +02:00
Dmitriy Zaporozhets
bed05a1381
Fix submodule_helper specs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 13:02:26 +02:00
Sytse Sijbrandij
e26c7f7767
Merge pull request #6280 from bovi/patch-1
...
Minor README fix
2014-02-10 11:45:00 +01:00
dosire
7b33efdf5e
More than text was missing a word on the help page.
2014-02-10 11:44:27 +01:00
Dmitriy Zaporozhets
dee11dadad
Fix submodules
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 09:55:38 +02:00
Dmitriy Zaporozhets
8b6a14b505
Bump for gitlab_git
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-10 09:36:31 +02:00
Robert Schilling
725d35edc2
Fixes #6073 , Update grammer in MR accept form
2014-02-09 20:20:42 +01:00
Robert Schilling
898d4fe37d
Fixes #6187 , Update dead links
2014-02-09 18:53:06 +01:00
Daniel Bovensiepen
b99adc9b9a
Minor README fix
...
I guess it should be "...*more* than 50,000"
2014-02-09 20:04:15 +08:00
robertd
acf209bc53
Update changelog for #6267
2014-02-08 17:24:49 -07:00
Dmitriy Zaporozhets
54b8921534
Merge branch 'feature/submodule-links' into 'master'
...
Better submodule links
Detect if submodule is hosted on this GitLab server, gitlab.com or github.com.
Hash links directly to commit in repo.
2014-02-08 19:47:11 +00:00
Dmitriy Zaporozhets
803ba84c6b
Merge pull request #6261 from skv-headless/badge_to_labels
...
Replace badge to labels, because twbs3 doesn't supprot colored badges
2014-02-08 14:23:10 +02:00
Dmitriy Zaporozhets
540da508ff
Merge pull request #6267 from robertd/feature-groups-on-profile-screen
...
Show avatars of groups on profile screen that user belongs to
2014-02-08 14:21:51 +02:00
robertd
973066e76d
Add tests for groups avatars check on user page
2014-02-07 22:45:46 -07:00
Dmitriy Zaporozhets
2f82035f2c
Merge branch 'better-description-and-50k' into 'master'
...
Better Description And 50k
2014-02-07 17:53:11 +00:00
dosire
ea10424e0e
Also change the description in the help.
2014-02-07 17:06:32 +01:00
dosire
e772da0c1e
Uniform description.
2014-02-07 17:03:36 +01:00
Dmitriy Zaporozhets
65d3438861
Merge branch 'bug/noteable_id' into 'master'
...
Fix bug with cross-reference note on commit
Fixes #1018
2014-02-07 11:36:08 +00:00
Dmitriy Zaporozhets
c03df58e9e
Fix turbolink-spinner for light theme
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-07 12:41:31 +02:00
Dmitriy Zaporozhets
4ecf30cd5b
Fix bug with cross-reference note on commit
...
It should not set noteable_id if noteable_type is Commit
We have Note#commit_id for this
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-07 12:34:30 +02:00
Dmitriy Zaporozhets
eb2f3a8044
More entries to CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-07 09:45:03 +02:00
robertd
b8e81e558f
Show avatars of groups on profile screen that user belongs to
2014-02-06 23:27:32 -07:00
skv
7a8f0019cf
Replace badge to labels, because twbs3 doesn't supprot colored badges
2014-02-06 22:16:47 +04:00
Dmitriy Zaporozhets
1759214fcc
Add group avatar to CHANGELOG
2014-02-06 16:32:03 +00:00
Dmitriy Zaporozhets
f7b46fa5ff
Merge branch 'improve/tab_names' into 'master'
...
Add icons and better names to Project/Group nav
2014-02-06 16:29:52 +00:00
Dmitriy Zaporozhets
0a3d50eb32
Fixed tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-06 16:17:33 +02:00
Dmitriy Zaporozhets
90ab30b74b
Fix encoding issues after gitlab_git 5.1.0
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-06 16:03:32 +02:00
Dmitriy Zaporozhets
eb272227c3
Add icons and better names to Project/Group nav
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-06 10:16:26 +02:00
Dmitriy Zaporozhets
f99ee99f65
Better color for nav links
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-02-06 09:51:39 +02:00
Dmitriy Zaporozhets
c0ec30aead
Merge branch 'link-to-recipies' into 'master'
...
Link To Recipies
People can't find the CentOS / RHEL guide. Now that it follows the official guide I think we can link to it.
2014-02-06 07:47:29 +00:00
Dmitriy Zaporozhets
db5f0e7e88
Merge branch 'update_gitlab_grit' into 'master'
...
Update gitlab-grit
2014-02-06 07:20:02 +00:00