home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Artem V. NavrotskiyandArtem V. Navrotskiy 8ec59bd18b Add API method for get user by ID of an SSH key 2015-09-03 15:47:22 +03:00
Dmitriy Zaporozhets 1d6a65a2ab Improve paddings and set new colors for links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 14:43:31 +02:00
Dmitriy Zaporozhets 7f045a6b4a Apply new font size and padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 14:24:27 +02:00
Dmitriy Zaporozhets 63ba17c4db Redesign activity feed on dashboard and project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 13:46:11 +02:00
Dmitriy Zaporozhets 59d9dc4408 Reduce margin under projects filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 10:24:10 +02:00
Dmitriy Zaporozhets 6630a06c40 Merge branch 'ui-improvements' into 'master' 
Implement new design for projects page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #2413

See merge request !1236
 2015-09-03 07:14:20 +00:00
Robert Speicher e5d89c1084 Remove unnecessary current_user context from filter specs 2015-09-02 23:54:40 -04:00
Robert Speicher ff8fb6a6a2 Merge branch 'update-mailroom' into 'master' 
Update mail_room to 0.4.2 for better error handling

See merge request !1234
 2015-09-02 21:53:50 +00:00
Dmitriy Zaporozhets 6fb7311e6e Fix home page for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 22:28:40 +02:00
Dmitriy Zaporozhets d0cfa4651c Avoid horizontal scroll in sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets c5786649c9 Keep header fluid for big res 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets 418dd5ebf8 Collapse sidebar button at the bottom 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets b879407695 Fix collapsed sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:33 +02:00
Dmitriy Zaporozhets 4406aeff05 Implement new design for projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 21:57:32 +02:00
Dmitriy Zaporozhets 14274cdc3b Merge branch 'refactor-starred-projects-page' into 'master' 
Split starred projects list and activity

In same way like we did with your projects. For consistency

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1238
 2015-09-02 19:50:37 +00:00
Dmitriy Zaporozhets d9f794a850 Merge branch 'grack-auth-new-instance' into 'master' 
Avoid instance variable re-use trouble

This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.

See merge request !1237
 2015-09-02 18:05:16 +00:00
Dmitriy Zaporozhets 774c523c1f Fix tests and update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 20:02:26 +02:00
Dmitriy Zaporozhets 5bbe6c4d54 Split starred projects list and activity in same way like we did with your projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 19:17:04 +02:00
Jacob Vosmaer 30bf2b9cc3 Avoid instance variable re-use trouble 
This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.
 2015-09-02 18:47:56 +02:00
Valery Sizov 81fe6f9d7e added spinach 2015-09-02 16:17:30 +03:00
Dmitriy Zaporozhets 28219ea921 Merge branch 'fix-raw-controller-disposition' into 'master' 
Remove the filename argument from Content-Disposition header

This MR removes the filename argument from the `Content-Disposition` header to avoid RFC 5987 and RFC 6266 encoding issues. Some browsers (e.g. Internet Explorer) do not properly decode a Unicode string properly, and this can lead to odd filenames in the raw file download. This change allows the browser to determine the filename based on the URL.

For example, if I have a file called `한글한글.pptx` and click to download it with the "Raw" button in the Files section, IE11 will ask:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/fdb688282c0d4564872deadb44c58b2c/image.png)

If you look at the `Content-Disposition` field, you see this:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2b342b83ae1ec61fd31937163ace8ec5/image.png)

Chrome, Firefox, and Safari seem to be able to handle UTF-8 encoded filenames, even though this is not standard.

See: http://greenbytes.de/tech/tc2231/

Closes https://github.com/gitlabhq/gitlabhq/issues/9595

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829

I've also submitted a pull request to Rails to support RFC 6266: https://github.com/rails/rails/pull/21461

See merge request !1235
 2015-09-02 12:25:28 +00:00
Valery Sizov 3700e5a960 Crowd integration 2015-09-02 12:42:01 +03:00
Douwe Maan 6f19e8799e Merge branch 'drone-ci' into 'master' 
Drone CI service

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1184#note_1980652

/cc @DouweM

See merge request !1215
 2015-09-02 07:23:40 +00:00
Stan Hu 551157960e Remove the filename argument from Content-Disposition header to avoid 
RFC 5987 and RFC 6266 encoding issues. This change allows the browser
to determine the filename based on the URL.

See: http://greenbytes.de/tech/tc2231/

Closes https://github.com/gitlabhq/gitlabhq/issues/9595

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
 2015-09-02 00:20:05 -07:00
Douwe Maan d72b8f87ac Update mail_room to 0.4.2 for better error handling 2015-09-02 08:12:01 +01:00
Stan Hu fbb891c8f3 Fix broken Wiki Page History 
Closes #2104

Closes #1751

Closes #1592

Closes https://github.com/gitlabhq/gitlabhq/issues/9399
 2015-09-01 23:29:27 -07:00
Kirilll Zaitsev 263abda3fd Drone CI service 2015-09-02 05:52:16 +03:00
Robert Speicher 21cacb36a7 Add RedactorFilter specs for invalid Group and Project references 2015-09-01 18:32:52 -04:00
Robert Speicher 5794d65a07 Add post_process method to Gitlab::Markdown 2015-09-01 18:16:56 -04:00
Robert Speicher ca8d225307 Update MarkdownFeature support class 
- Memoize variables a bit more cleanly
- Add user to project's team
 2015-09-01 18:09:52 -04:00
Robert Speicher 86f706b169 Fix GitlabMarkdownHelper spec 2015-09-01 18:09:20 -04:00
Robert Speicher 81fc63bec0 Remove current_user context from markdown and gfm helpers 
These helpers are no longer dependent on the current user state. Hooray!
 2015-09-01 17:59:09 -04:00
Robert Speicher 8db4628b8a Rescue from RecordNotFound in RedactorFilter 2015-09-01 17:59:09 -04:00
Robert Speicher 1ec68ea9c2 Default user_can_reference? to true when no attributes match 
Now, a reference link with a `.gfm` class but without one of our
`data-*-id` attributes should be shown to the user rather than hidden.
 2015-09-01 17:59:08 -04:00
Marin Jankovski 308c6428ae Merge branch 'use_db_for_application_settings' into 'master' 
Check if database connection exists when loading application settings

!1217 broke omnibus-gitlab nightly builds. In omnibus-gitlab we precompile assets without a running database.

See merge request !1230
 2015-09-01 21:14:57 +00:00
Robert Speicher 7f75300573 Add RedactorFilter 2015-09-01 17:00:29 -04:00
Robert Speicher 454d227b45 Remove all permission checking from Reference filters 2015-09-01 16:58:38 -04:00
Douwe Maan afb2e6f485 Merge branch 'rs-cleanup-redcarpet-renderer' into 'master' 
Decouple Gitlab::Markdown from the GitlabMarkdownHelper

This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).

See merge request !1223
 2015-09-01 20:13:44 +00:00
Robert Speicher 1bcfe4d2ff Remove PreferencesHelper include from GitlabMarkdownHelper 2015-09-01 13:37:05 -04:00
Douwe Maan 2236e9d617 Merge branch 'fix-bitbucket-import-issue-order' into 'master' 
Import all Bitbucket issues and sort issues by creation date

Previously only the first 15 Bitbucket issues would be imported. Other issues in the API return call also calls import errors.

Tested by importing 400+ issues from this repo: https://bitbucket.org/ned/coveragepy

API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518

Closes https://github.com/gitlabhq/gitlabhq/issues/9519

See merge request !1226
 2015-09-01 17:29:08 +00:00
Robert Speicher f43e48a1ce Require gitlab/markdown in ReferenceExtractor 2015-09-01 13:28:19 -04:00
Stan Hu 2e9c922dd1 Fix bug where only the first 15 Bitbucket issues would be imported. 
Also fix a number of issues where author/reporter names were not available.
 2015-09-01 08:50:20 -07:00
Marin Jankovski 3a8773fb2f Added USE_DB env var to allow loading fake settings without db running. 2015-09-01 17:49:16 +02:00
Stan Hu 31e4654b1f Sort issues by creation date in Bitbucket importer 
API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518

Closes https://github.com/gitlabhq/gitlabhq/issues/9519
 2015-09-01 08:46:42 -07:00
Dmitriy Zaporozhets 2ef16e7660 Merge branch 'gitlab-git-http-server' into 'master' 
Replace grack with gitlab-git-http-server

See merge request !1229
 2015-09-01 14:21:45 +00:00
Dmitriy Zaporozhets 26be65337c Merge branch 'profile-settings' into 'master' 
Rename profile settings navigation to "Profile Settings" 

Fixes #2555 

See merge request !1926
 2015-09-01 12:33:04 +00:00
Dmitriy Zaporozhets f0aa6986fa Update db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-01 14:01:56 +02:00
Dmitriy Zaporozhets f07273f6f6 Rename profile settings navigation to "Profile Settings" 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-01 13:35:03 +02:00
Marin Jankovski aa1c321459 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-01 12:51:57 +02:00
Valery Sizov 96b55a0e90 Merge branch 'master' into 'master' 
Update Racc to 1.4.12

The primary reason for this is that this would let me debug #2343 using Rubinius' `-Xic.debug` option.

See merge request !1201
 2015-09-01 10:38:46 +00:00