home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,168 Commits 48 Branches 340 Tags
17cc76c9a94e6edf24bfb0803e6838db3675bfbc
Commit Graph
14168 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Dmitriy Zaporozhets a04ac76117 Fix MR labels css 2015-02-18 00:23:01 -08:00
Dmitriy Zaporozhets a6070074bc Update CHANGELOG with performance improvements 2015-02-18 00:17:23 -08:00
Dmitriy Zaporozhets a8a328b151 DB performance improvements to GitLab 2015-02-18 00:16:42 -08:00
Dmitriy Zaporozhets 367d9a2dc6 Update CHANGELOG 2015-02-17 22:42:04 -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 82536f50a2 Merge pull request #8774 from tsigo/rs-testenv 
TestEnv improvements
 2015-02-17 22:09:10 -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 fe2b98ab0b Merge branch 'remove-group-id' into 'master' 
Remove Group#owner_id from API

For #1943

See merge request !1537
 2015-02-18 01:42:47 +00:00
Dmitriy Zaporozhets 000865f138 Merge branch 'gitlab-com-import' into 'master' 
Hide Gitlab.com import for GitLab.com

See merge request !1538
 2015-02-18 01:41:05 +00: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 24d939afb9 Remove Group#owner_id from API since it is not used any more 2015-02-17 16:23:44 -08:00
Dmitriy Zaporozhets 896c046217 Affix assignee/milestone block 2015-02-17 16:14:49 -08:00
Dmitriy Zaporozhets 417975ae2f Merge branch 'bump-gitlab-shell' into 'master' 
Bump gitlab shell

See merge request !1535
 2015-02-17 22:43:16 +00:00
Dmitriy Zaporozhets c3e05fc321 Bump gitlab-shell version 2015-02-17 13:15:29 -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