home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,186 Commits 48 Branches 340 Tags
de040ffaaef4ad5ebd93b3f7a237add438dbddd5
Commit Graph
14186 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitriy Zaporozhets 833d4dddf2 Dont send 404 if no broadcast messages now because it flood gitlab-shell logs with 404 errors :( 2015-02-18 14:34:05 -08:00
Dmitriy Zaporozhets 138aa81e60 Get contributed projects only if push event exists 2015-02-18 14:20:26 -08:00
Dmitriy Zaporozhets 93dde8a312 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-18 14:02:49 -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
Douwe Maan 3d6b042e9e Fix push access check when not signed in. 2015-02-18 21:59:15 +01:00
Robert Schilling 6f2ad9f66f Merge pull request #8814 from gitlabhq/jvanbaarsen-patch-1 
Escape process text
 2015-02-18 19:54:04 +01: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
Jeroen van Baarsen 823f8c1a1c Escape process text 
The Feature request copy paste text was not properly escaped.
 2015-02-18 18:13:10 +01:00
Douwe Maan 15bee7e0ff Fix Markdown relative links to files with anchors. 2015-02-18 12:32:20 +01:00
Dmitriy Zaporozhets 0b8e41aae2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-18 00:24:03 -08: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