Dmitriy Zaporozhets
6a6a334522
Fix active tab tests
2015-02-19 17:24:34 -08:00
Dmitriy Zaporozhets
00ac564423
Improve sidebar active state
2015-02-19 16:46:19 -08:00
Dmitriy Zaporozhets
c2623d2e20
Sidebar items should be same height for collapsed and expanded version
2015-02-19 16:27:20 -08:00
Dmitriy Zaporozhets
ad67bf51d2
Fix collapsing of milestones and labels items
2015-02-19 16:24:59 -08:00
Dmitriy Zaporozhets
78aa1bb4e2
Fix tab highlighting
2015-02-19 16:16:41 -08:00
Dmitriy Zaporozhets
4511bc1f3d
Prettify milestones page
2015-02-19 15:56:23 -08:00
Dmitriy Zaporozhets
b876793d03
Restlye issueable filters to be more compact
2015-02-19 15:47:10 -08:00
Dmitriy Zaporozhets
6177256033
Move labels/milestones tabs to side navigation
2015-02-19 15:46:48 -08:00
Dmitriy Zaporozhets
ee26dae63e
Update bootstrap-sass gem
2015-02-19 15:02:49 -08:00
Dmitriy Zaporozhets
9470675b4e
Merge branch 'projects-limit-default' into 'master'
...
Correctly set default projects limit for new users.
See #2014 .
Note that the projects limit still isn't retroactively applied to existing users (probably as intended)
See merge request !1547
2015-02-19 20:48:49 +00:00
Dmitriy Zaporozhets
7ccd61275b
Merge pull request #8816 from rumpelsepp/css-fix
...
Add missing color codes for line anchors, fixes #8628
2015-02-19 11:57:23 -08:00
Douwe Maan
1d6050104c
Correctly set default projects limit for new users.
2015-02-19 19:26:57 +01:00
Dmitriy Zaporozhets
8184a65644
Revert "Fix broken access control and refactor avatar upload"
...
This reverts commit 7d5f86f6cb
2015-02-19 08:57:35 -08:00
Dmitriy Zaporozhets
7c3147e6e9
Revert "Nitpicking."
...
This reverts commit ebd39fc082
2015-02-19 08:57:33 -08:00
Dmitriy Zaporozhets
3c2139ed17
Fix trending projects ordering
2015-02-18 22:23:24 -08:00
Dmitriy Zaporozhets
86d5e20664
Respect star ordering on explore page
2015-02-18 16:40:22 -08:00
Dmitriy Zaporozhets
716544085c
Get contributed projects for last year only
2015-02-18 15:16:13 -08:00
Dmitriy Zaporozhets
138aa81e60
Get contributed projects only if push event exists
2015-02-18 14:20:26 -08:00
Dmitriy Zaporozhets
d0a73c5ac7
Merge branch 'fix-user-page' into 'master'
...
Fix user page performance
See merge request !1543
2015-02-18 22:02:20 +00:00
Sytse Sijbrandij
155b2d46ae
Say unassigned instead of WIP for merge requests since it might not fit everyones workflow.
2015-02-18 13:48:57 -08:00
Dmitriy Zaporozhets
2f0a764d31
Fix user page performance and authorization
2015-02-18 13:28:24 -08:00
Dmitriy Zaporozhets
75d2145ec0
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-02-18 10:12:18 -08:00
Dmitriy Zaporozhets
057d43500b
Merge branch 'performance-improvements' into 'master'
...
Performance improvements
* More efficient DB queries
* Cache ApplicationSettings per request
* Dont query for objects you dont need
See merge request !1540
2015-02-18 18:11:37 +00:00
Stefan Tatschner
9a5199f005
Add missing color codes for line anchors, fixes #8628
2015-02-18 19:10:02 +01:00
Sytse Sijbrandij
a6a9cc6245
Merge branch 'no-highlight-files' into 'master'
...
Add "NEWS" to no_highlight_files
"NEWS" is used in gnu style opensource projects for the changelog. So let's add it to `no_highlight_files`.
See merge request !249
2015-02-18 17:58:36 +00:00
Dmitriy Zaporozhets
544596681a
Merge branch 'fix-relative-anchored-links' into 'master'
...
Fix Markdown relative links to files with anchors.
Fixes #2016 .
cc @marin
See merge request !1541
2015-02-18 17:40:16 +00:00
Dmitriy Zaporozhets
63f11a68c5
Fix event loading with associations
2015-02-18 09:38:46 -08:00
Douwe Maan
15bee7e0ff
Fix Markdown relative links to files with anchors.
2015-02-18 12:32:20 +01:00
Dmitriy Zaporozhets
0e9f4320b5
Merge branch 'improve-user-profile' into 'master'
...
Improve user profile page
See merge request !1539
2015-02-18 08:23:43 +00:00
Dmitriy Zaporozhets
a04ac76117
Fix MR labels css
2015-02-18 00:23:01 -08:00
Dmitriy Zaporozhets
a8a328b151
DB performance improvements to GitLab
2015-02-18 00:16:42 -08:00
Dmitriy Zaporozhets
70edf950fe
Show contributed projects on user page and stars for it
2015-02-17 22:40:00 -08:00
Dmitriy Zaporozhets
d905a431e8
Merge branch 'affix-assignee' into 'master'
...
Affix milestone/assignee UI element
See merge request !1536
2015-02-18 05:42:24 +00:00
Dmitriy Zaporozhets
19eb86388a
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-02-17 21:25:06 -08:00
Dmitriy Zaporozhets
0bd02e96a0
Merge pull request #8810 from m-a-r-c-o/unify-new-group-project-button
...
Add new style to "New group" button
2015-02-17 16:34:12 -08:00
Dmitriy Zaporozhets
ff492307b9
Dont show gitlab.com import for gitlab.com :)
2015-02-17 16:27:40 -08:00
Dmitriy Zaporozhets
896c046217
Affix assignee/milestone block
2015-02-17 16:14:49 -08:00
Dmitriy Zaporozhets
0da0d800f2
Merge branch 'md-preview-class' into 'master'
...
Make sure Markdown previews always use the same styling as the eventual destination.
Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body.
See merge request !1514
2015-02-17 20:38:53 +00:00
Marco Cyriacks
57e91940dd
Add new style to "New group" button
...
The new group button style was changed to have the same look as the new
project button (green background).
2015-02-17 20:52:03 +01:00
Dmitriy Zaporozhets
55a906f643
Merge branch 'fix_access_control_notes' into 'master'
...
Fix broken access control for note attachments
From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/332 by Hannes Rosenögger.
See merge request !1528
2015-02-17 18:05:12 +00:00
Douwe Maan
080449f8af
Make sure Markdown previews always use the same styling as the eventual destination.
2015-02-17 17:58:08 +01:00
Dmitriy Zaporozhets
904c382f6a
Fix code rendering for snippets
2015-02-17 00:16:28 -08:00
Dmitriy Zaporozhets
9eef14279f
Merge branch 'oauth-dup' into 'master'
...
Fix duplicate authorized applications
On the profile applications page, display one row per authorized app instead of one row per access token. See #1987 .
cc @sytse
See merge request !1524
2015-02-16 23:08:50 +00:00
Dmitriy Zaporozhets
9a575522d5
Merge branch 'issue-title-css' into 'master'
...
Remove top margin for issue/mr title
See merge request !1529
2015-02-16 22:16:35 +00:00
Douwe Maan
ebd39fc082
Nitpicking.
2015-02-16 20:10:15 +01:00
Hannes Rosenögger and Douwe Maan
7d5f86f6cb
Fix broken access control and refactor avatar upload
...
This commit moves the note folder from
/public/uploads/note
to
/uploads/note
and changes the uploader accordingly.
Now it's no longer possible to avoid the access control by modifing the url.
The Avatar upload has been refactored to use an own uploader as well
to cleanly seperate the two upload types.
2015-02-16 20:10:15 +01:00
Dmitriy Zaporozhets
b0a9dbdfb1
Remove top margin for issue/mr title
2015-02-16 10:14:07 -08:00
Douwe Maan
29a997cde9
Properly clear notes bindings to prevent double comments on Ctrl-Enter.
2015-02-16 18:25:57 +01:00
Sytse Sijbrandij
87b4135924
Subscription should be a link on its own.
2015-02-15 21:51:23 -08:00
Vinnie Okada
e0f61a59b4
Use shorter map() syntax
2015-02-15 20:50:53 -07:00
Dmitriy Zaporozhets
Dmitriy Zaporozhets
Douwe Maan
Sytse Sijbrandij
Stefan Tatschner
Marco Cyriacks
Hannes RosenöggerandDouwe Maan
Vinnie Okada