home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 21:46:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,643 Commits 48 Branches 340 Tags
6bc32fe4fd157f2e84c12e7846feeac190fb8499
Commit Graph
10643 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 6bc32fe4fd Merge branch 'upgrade_devise' into 'master' 
Upgrade devise from 3.0.4 to 3.2.4

See merge request !960
 2014-07-10 20:26:22 +00:00
Marin Jankovski 60cc1d8e92 Override strong params for sign up. 2014-07-10 19:31:05 +02:00
Dmitriy Zaporozhets 7a914e5a8f Merge branch 'rework-counters' into 'master' 
Rework counters

* Use one style for counters in sidebar
* show amount of assigned/authored/all entities in sidebar
* fixes UI overflow for small screens

See merge request !961
 2014-07-10 15:51:28 +00:00
Dmitriy Zaporozhets cff1758486 Show counters in sidebar filter in same way like we did for projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-10 17:54:31 +03:00
Marin Jankovski 108be8a666 Update to accomodate devise deprecations and backward incompatible changes. 2014-07-10 13:56:35 +02:00
Marin Jankovski 1e3fce1a82 Check for the correct param for token. 2014-07-10 13:10:37 +02:00
Dmitriy Zaporozhets a338954c33 Merge branch 'prevent-html-injection' into 'master' 
Prevent html injection

Commits page renders commit description with single_format method which allows html tags. So commit message with html tags brokers Commits page. See screenshot

![Screenshot 2014-07-10 11.16.40](https://dev.gitlab.org/uploads/gitlab/gitlabhq/6606e1bac0/Screenshot_2014-07-10_11.16.40.png)

See merge request !959
 2014-07-10 09:16:48 +00:00
Dmitriy Zaporozhets 53a8d50b2b Prevent html injection on commits page by commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-10 11:09:00 +03:00
Dmitriy Zaporozhets 4fb5a39dc0 Merge branch 'group_milestones_description' into 'master' 
Group milestones description

Fixes #1403

See merge request !958
 2014-07-10 07:44:16 +00:00
Marin Jankovski 018602b4c8 Merge branch 'fix/notes_reply_click_issue401' into 'master' 
Get Reply button as clicked target in notes.js.coffee

See issue #401

This is a small fix to properly find the reply button as the click target when an element inside the button is clicked (e.g. in this case, the ``<i class="icon-comment">`` element in the button, using the jQuery ``.closest(...)`` function.

Previously, the clicked element was assumed to be the button itself, which caused the comment form to spawn within the button when it was clicked (see the issue for screenshots & other details).
 2014-07-10 07:28:38 +00:00
Marin Jankovski 4a505f38ac Update the tests with milestones descriptions. 2014-07-10 08:46:52 +02:00
Marin Jankovski 0f80ffdf87 Use heading instead of strong and line breaks in description. 2014-07-10 08:37:51 +02:00
Marin Jankovski d4e7db4082 Add milestone descriptions on the group show page. 2014-07-10 08:36:28 +02:00
Ali Tavakoli 0b1cf50060 Added .closest() to find Reply button on click; fixes #401 
This is to fix the issue where the icon-comment icon is clicked in the
Reply button of a note; the icon is used as the target and incorrectly
assumed to be the button itself, which causes the reply form to spawn
inside the button.
 2014-07-09 18:16:24 -04:00
Dmitriy Zaporozhets 1f3261ac41 More entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-09 19:13:31 +03:00
Dmitriy Zaporozhets c337a27824 Merge branch 'browse_file' into 'master' 
Browse file

Fixes #1335

See merge request !951
 2014-07-09 15:13:00 +00:00
Dmitriy Zaporozhets 70848097a4 Merge branch 'active_highlight' into 'master' 
Active highlight

This will highlight active page regardless of the action we use.

See merge request !957
 2014-07-09 15:11:34 +00:00
Marin Jankovski 4024aa8e81 Try to keep token authenticable compatibility 2014-07-09 14:42:25 +02:00
Marin Jankovski 34cfd84ed2 Upgrade to devise 3.2.4 2014-07-09 13:22:32 +02:00
Marin Jankovski d6067296de Active link based on controller rather than action. 2014-07-09 11:38:29 +02:00
Marin Jankovski 91e01275cb Add tests to check for correct browse link name. 2014-07-09 10:12:09 +02:00
Marin Jankovski 6b121aa5a7 Move the links decision to helper. 2014-07-09 10:12:09 +02:00
Marin Jankovski 5d25f3d9b1 Differentiate between dirs, files and general code. 2014-07-09 10:12:08 +02:00
Marin Jankovski de22913501 Check if blob is requested. 2014-07-09 10:12:08 +02:00
Marin Jankovski 4e0afce6a7 Show browse file if we are browsing file history. 2014-07-09 10:12:08 +02:00
Dmitriy Zaporozhets 47d5ef4bd5 Merge branch 'update-highlight-js' into 'master' 
Update highlight.js to 8.1

Pack version including all supported languages. Yay for Haml, Clojure, Go and Erlang support!

Fixes #1411.

See merge request !956
 2014-07-09 07:40:24 +00:00
Dmitriy Zaporozhets 437cccf9a9 Update highlight.js to 8.1 
Also added support for less common languages. All languages from
http://highlightjs.org/download/ now supported

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-09 09:47:06 +03:00
Dmitriy Zaporozhets 22995fc932 Merge branch 'redirect_betwee_tree_and_blob' into 'master' 
Redirect between tree and blob

This checks if on requested non-existing tree path blob exists, redirects to blob path if the file exists, otherwise return not found.

See #1369

See merge request !953
 2014-07-09 06:19:18 +00:00
Marin Jankovski e87f238077 Add tests for redirects. 2014-07-08 20:25:25 +02:00
Dmitriy Zaporozhets 4c3785afbf Merge branch 'fix-path-regex' into 'master' 
Fix path regex

Fixes #1208

See merge request !955
 2014-07-08 16:49:03 +00:00
Dmitriy Zaporozhets 6a0cb25096 Dont allow ? in project path 
Because it causes 500 error on every page where link to such project
exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 18:15:23 +03:00
Dmitriy Zaporozhets ac1ff491b4 Merge branch 'fix-archive-corrupt' into 'master' 
Fix archive corruption

* When I click download I trigger archive creation
* We don't use tmp storage for uncompleted archive
* When I refresh a page - archiving still in progress but file already exists - I get corrupted (unfinished) file
* If I wait for few more seconds and click download - I get correct file because archiving operation finished and file is valid

This MR fixes issue by bumping `gitlab_git` to newer version. In this version archive created in tmp file and becomes available only when archive operation finished.

Fixes #1394

See merge request !954
 2014-07-08 14:25:59 +00:00
Dmitriy Zaporozhets d51294b99f Bump gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 15:48:25 +03:00
Dmitriy Zaporozhets 593e262e40 Fix 500 on repo archive download 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 14:55:20 +03:00
Dmitriy Zaporozhets 85a15b0e22 Merge pull request #7152 from bhuisgen/master 
Fix LDAP TLS authentication
 2014-07-08 09:44:29 +03:00
Dmitriy Zaporozhets 7bd9a702e3 Merge pull request #7222 from jhund/fix-5936 
Don't remove trailing newline when editing a file in web UI editor
 2014-07-08 09:43:23 +03:00
Dmitriy Zaporozhets 715b8181ef Merge pull request #7273 from whitesheep/patch-1 
gitlab-shell
 2014-07-08 09:42:09 +03:00
Marco Rondini e97834567b gitlab-shell 
version change
 2014-07-07 21:32:46 +02:00
Dmitriy Zaporozhets 3cb99017c7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-07 17:07:27 +03:00
Dmitriy Zaporozhets 664112b47e Merge branch 'improve-email-threading' into 'master' 
Improve email threading

This is a follow-up to !112 : it improves email threading, without changing the receiver of the emails.

* Subject of answers to an existing thread begins with `Re: ` (required by Mail.app)
* Send a 'In-Reply-To' header along the 'References' header
 2014-07-07 14:06:40 +00:00
Marin Jankovski 005752e4c6 Check if blob or tree and redirect to the correct one. 2014-07-07 15:46:57 +02:00
Dmitriy Zaporozhets 5a67d482af Merge branch 'sanitize_rake_check_output' into 'master' 
Sanitize rake check output

Fixes #1206

See merge request !952
 2014-07-07 13:33:11 +00:00
Marin Jankovski cb4d8eff4c Add sanitize option to documentation. 2014-07-07 14:41:02 +02:00
Marin Jankovski 553f3aba48 Remove duplicated calls. 2014-07-07 14:19:32 +02:00
Marin Jankovski 4c68d2387e Add sanitize option to gitlab check rake task. 2014-07-07 14:12:06 +02:00
Dmitriy Zaporozhets d5a8f9ccca Merge branch 'cleaner-help-page' into 'master' 
Cleaner help page

Focus on documentation. Move quick help section to right. Remove unnecessary styling

See merge request !950
 2014-07-05 08:16:07 +00:00
Dmitriy Zaporozhets a5379ef9f7 Cleaner help page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 10:24:57 +03:00
Dmitriy Zaporozhets fe2cb593f9 Improve markdown doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 08:52:43 +03:00
Dmitriy Zaporozhets 5bb2840dc4 Merge branch 'notification_when_reopened' into 'master' 
Notification when reopened issue or mr

Fixes #1396

See merge request !939
 2014-07-05 05:40:32 +00:00
Dmitriy Zaporozhets 6947d3c0ba Truncate header title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-05 02:03:33 +03:00