Commit Graph
14204 Commits
Author SHA1 Message Date
Douwe Maan 08874d2b51 Make changes to nginx config less likely to break something. 2015-02-20 23:27:17 +01:00
Douwe Maan 0c4d27e82d Point out nginx config changes in update guides. 2015-02-20 22:36:19 +01:00
Douwe Maan 938a1381fc Satisfy Rubocop. 2015-02-20 16:04:03 +01:00
Douwe Maan 73d12d6e6d Update changelog. 2015-02-20 13:24:51 +01:00
Douwe Maan 00ca490259 Use controllers to serve uploads, with XSS prevention and access control. 2015-02-20 13:13:48 +01:00
Douwe Maan 4310431ee7 Use modified ActionDispatch::Static to let uploads go through to routes. 2015-02-20 12:44:07 +01:00
Douwe Maan eb210f4a18 Modify nginx config to let /uploads go through to unicorn. 2015-02-20 12:22:53 +01:00
Dmitriy Zaporozhets 6b0199ffc1 Merge branch 'ui-improvements' into 'master'
UI improvements

* lighter color for comments count
* better UI for issue assigee.milestone block

See merge request !1551
2015-02-20 08:36:28 +00:00
Dmitriy Zaporozhets 675f595406 Bigger and bold title for issue/mr show pages 2015-02-20 00:20:17 -08:00
Dmitriy Zaporozhets 50df9a7cb9 Minor css improvements
* lighter color for comments count
* better UI for issue assigee.milestone block
2015-02-20 00:11:25 -08:00
Dmitriy Zaporozhets abc65bbbf3 Improve sidebar navigation UI for mobile devices 2015-02-19 23:18:21 -08:00
Dmitriy Zaporozhets 74ccfa8f79 Remove overflow-y style that cause overflow-x strange behaviour on mac 2015-02-19 23:05:40 -08:00
Dmitriy Zaporozhets a6220d0a9f Update CHANGELONG 2015-02-19 22:49:49 -08:00
Dmitriy Zaporozhets 56af5f5cf9 Improve commits page UI 2015-02-19 22:42:54 -08:00
Dmitriy Zaporozhets 2f2d82e945 Merge branch 'ui-improvements' into 'master'
Ui improvements

* improve UI for commits, issues and merge requests lists
* refactor commit css

See merge request !1550
2015-02-20 06:25:09 +00:00
Dmitriy Zaporozhets 692aa78380 Improve issue and merge request lists UI 2015-02-19 21:55:47 -08:00
Dmitriy Zaporozhets 906f8efd29 Refactor commits css 2015-02-19 20:45:21 -08:00
Dmitriy Zaporozhets ee6c4a2cca Improve commits UI 2015-02-19 18:23:10 -08:00
Dmitriy Zaporozhets de040ffaae Merge branch 'ui-improvements' into 'master'
Ui improvements

* update bootstrap
* move milestones and labels to the left
* make open/closed/all filter as tab
* make issues page more compact

For  #1871

See merge request !1549
2015-02-20 02:03:04 +00:00
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 84b556b7bc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-19 11:59:15 -08:00
Dmitriy Zaporozhets d4e43dc1e6 Bump gitlab-shell 2015-02-19 11:58:29 -08: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
Dmitriy Zaporozhets e480e45a8b Merge branch 'doc-omnibus-differences' into 'master'
Document fun facts about omnibus-gitlab

I hope this helps developers understand some of the differences.

See merge request !1546
2015-02-19 19:02:50 +00:00
Douwe Maan 1d6050104c Correctly set default projects limit for new users. 2015-02-19 19:26:57 +01:00
Dmitriy Zaporozhets 17cc76c9a9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-19 09:58:06 -08:00
Dmitriy Zaporozhets 19c5c44535 Merge branch 'revert-upload-refactor' into 'master'
Revert upload refactor

See merge request !1548
2015-02-19 17:57:27 +00: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
Jeroen van Baarsen cbf6b6871e Merge pull request #8802 from Bugagazavr/patch-1
Update API branches documentation [ci skip]
2015-02-19 13:04:24 +01:00
Jacob Vosmaer 93e42f690b Document fun facts about omnibus-gitlab 2015-02-19 11:20:58 +01:00
Dmitriy Zaporozhets 3c2139ed17 Fix trending projects ordering 2015-02-18 22:23:24 -08:00
Dmitriy Zaporozhets 2317977077 Merge branch 'structure-oauth-docs' into 'master'
Structure oauth docs

Fixes #2010

@valery please let me know if I used the right terminology (GitLab as an OAuth2 client)

See merge request !1545
2015-02-19 06:14:24 +00:00
Dmitriy Zaporozhets a3d039259e Fix broken links in documentation 2015-02-18 22:07:09 -08:00
Dmitriy Zaporozhets ff70d2f24e Improve GitLab.com integration documentation 2015-02-18 22:06:49 -08:00
Sytse Sijbrandij 10e4e2110c Improve the explanation and linking of the Oauth docs. 2015-02-18 20:49:19 -08:00
Dmitriy Zaporozhets 5555c4d99c Time for 7.9.0.pre 2015-02-18 17:42:29 -08:00
Dmitriy Zaporozhets 86d5e20664 Respect star ordering on explore page 2015-02-18 16:40:22 -08:00
Dmitriy Zaporozhets 7ad5fd6ce7 Merge branch 'access-check-when-signed-out' into 'master'
Fix push access check when not signed in.

Was causing 500 on MR, Blob, Tree pages.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8637 and https://github.com/gitlabhq/gitlabhq/issues/8813.

See merge request !1542
2015-02-18 23:24:06 +00:00
Dmitriy Zaporozhets 716544085c Get contributed projects for last year only 2015-02-18 15:16:13 -08:00
Dmitriy Zaporozhets 558dd81197 Improve broadcast message API 2015-02-18 14:58:20 -08:00