home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,296 Commits 48 Branches 340 Tags
765eabeacccbc199bb2a762dffdb7abde6adb246
Commit Graph
11296 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Bodenmiller 765eabeacc add HSTS Policy warning 
Add warning about HSTS header as it means user will need to provide secure connection access to site for next 24 months from page view. See https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security for more details.
 2014-09-01 15:47:15 -07:00
Dmitriy Zaporozhets 4102eb3b85 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-01 16:20:10 +03:00
Dmitriy Zaporozhets 83a588c316 Merge branch 'comment-and-close' into 'master' 
Comment and close

Fixes #1240

See merge request !1055
 2014-09-01 13:19:38 +00:00
Dmitriy Zaporozhets 99425a124c Post comment when hit close/reopen btn in comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 15:37:53 +03:00
Dmitriy Zaporozhets 31773f4dd7 Merge branch 'milestone_percentage' into 'master' 
Show milestone percentage in detail page, fixes #485

#### What does this MR do?

This MR adds the percentage count also to the milestone detail page.

##### Why was this MR needed?

Currently, this is only shown in the overview list.

##### What are the relevant issue numbers?

#485

###### Screenshots

![Screenshot 2014-08-17 21.14.27](https://gitlab.com/uploads/razer6/gitlab-ce/27e6f20bf2/Screenshot_2014-08-17_21.14.27.png)

See merge request !170
 2014-09-01 11:35:43 +00:00
Dmitriy Zaporozhets 6dd140047f Merge branch 'search-issues-spinach' into 'master' 
Added Spinach tests for search issues by issue-description

Added Spinach tests for 'search issues by description' feature which was added to Changelog 7.1 for feature "Filter by description on Issues#index page"

See merge request !172
 2014-09-01 11:35:09 +00:00
Dmitriy Zaporozhets 2dc31b76aa Merge pull request #7409 from robbytaylor/feature/remove-redundant-spans 
Removed redundant spans
 2014-09-01 14:14:38 +03:00
Dmitriy Zaporozhets 94e7138bdb Merge pull request #7406 from robbytaylor/feature/group-row-padding 
Moved padding from li to a in dashboard groups / projects listing
 2014-09-01 14:04:12 +03:00
Dmitriy Zaporozhets 20dbc2a139 Merge pull request #7425 from Razer6/remove_dup_javascript 
Remove duplicated setupNoteForm method
 2014-09-01 14:03:10 +03:00
Dmitriy Zaporozhets a28fe934d6 Merge pull request #7628 from zzet/update_markdown 
Update redcarpet gem
 2014-09-01 14:01:19 +03:00
Dmitriy Zaporozhets 8235d3ecdf Merge pull request #7659 from Razer6/feature/shortcuts 
Awesome keyboard shortcuts for GitLab
 2014-09-01 13:47:44 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Dmitriy Zaporozhets 4198b58a8c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-01 12:19:17 +03:00
Jeroen van Baarsen 174c00cf2c Merge pull request #7428 from bbodenmiller/patch-2 
[Documentation] add prepare for update details to 5.1 to 6.0 guide
 2014-08-31 10:46:50 +02:00
Robert Schilling e78b2b9040 Merge branch 'double_quotes_empty_project' into 'master' 
Modify empty project instructions to use double quotes for commit mesage

Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/6006904-modify-instruction-to-use-double-quotes-for-windo

See merge request !179
 2014-08-31 07:41:38 +00:00
Ben Bodenmiller 44185ace11 add prepare for upgrade section 
helps detect and correct issues that may occur during upgrade before
they have already occurred. easier to address issues before you start
upgrade process.
 2014-08-30 17:04:45 -07:00
Achilleas Pipinellis a870bc9ddf Modify empty project instructions to use double quotes for commit msg. 
http://feedback.gitlab.com/forums/176466-general/suggestions/6006904-modify-instruction-to-use-double-quotes-for-windo
 2014-08-31 01:08:01 +03:00
Dmitriy Zaporozhets 1d04a6fda7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-30 10:17:07 +03:00
Dmitriy Zaporozhets 14f5199cdc Merge branch 'feature-ldap-tests' into 'master' 
Feature ldap tests

Move specs to proper places. Relates to #154

This is already mergeable, will continue in a new branch for additions & refactorings.

See merge request !1053
 2014-08-30 07:16:45 +00:00
Dmitriy Zaporozhets cb71b26353 Merge branch 'ldap_allow_email' into 'master' 
Avoid ldap.allow_username_or_email_login issues

See merge request !1016
 2014-08-30 07:15:31 +00:00
Dmitriy Zaporozhets 0ef9ee18b1 Merge pull request #7639 from PeterDaveHello/patch-1 
make CI build faster
 2014-08-30 10:07:39 +03:00
Robert Schilling d7b66e60d2 Merge pull request #7642 from cirosantilli/patch-5 
Comment typo.
 2014-08-29 21:49:03 +02:00
Ciro Santilli af7b19003c Comment typo. 2014-08-29 20:11:57 +02:00
Robert Schilling 8a7d10af23 Merge pull request #7641 from cirosantilli/patch-4 
Comment typo.
 2014-08-29 20:08:51 +02:00
Ciro Santilli 5317c26cf7 Comment typo. 2014-08-29 19:35:04 +02:00
Robert Schilling 48d8f993c3 Merge pull request #7640 from PeterDaveHello/patch-2 
Use svg instead of png to get better image quality
 2014-08-29 18:52:49 +02:00
Peter Dave Hello 02ee3a53a0 Use svg instead of png to get better image quality 2014-08-30 00:50:44 +08:00
Peter Dave Hello 09f83de297 make CI build faster 2014-08-30 00:44:56 +08:00
Jan-Willem van der Meer 0d5ae2802e Move and rename ldap / oauth specs 2014-08-29 17:30:42 +02:00
Dmitriy Zaporozhets f2befb6934 Merge pull request #7221 from mcmillion/fix-issue-comment-rss-feed 
Fix Atom feed for comments
 2014-08-29 17:48:37 +03:00
Dmitriy Zaporozhets 933d2dcc97 Merge pull request #7634 from zzet/patch-11 
Return extra empty line in blob render
 2014-08-29 17:43:51 +03:00
Dmitriy Zaporozhets 3daef3dd51 Merge pull request #7517 from jvanbaarsen/guard-spring-fix 
Updated the spring gem and fixed the guard file
 2014-08-29 17:39:18 +03:00
Dmitriy Zaporozhets dae9faf340 Merge pull request #7519 from jvanbaarsen/enable-blame-highlighting 
Enable highlighting for blame
 2014-08-29 17:38:50 +03:00
Jan-Willem van der Meer 97547428bd Rename ldap tests even further 2014-08-29 16:04:00 +02:00
Jacob Vosmaer 1526ddce1a Add CHANGELOG entry for LDAP takeover deprecation 2014-08-29 15:38:51 +02:00
Jacob Vosmaer 614ca3ec65 Remove LDAP::Access#find_user 
This method existed to allow LDAP users to take over existing GitLab
accounts if the part before the '@' of their LDAP email attribute
matched the username of an existing GitLab user. I propose to disable
this behavior in order to prevent unintended GitLab account takeovers.

After this change it is still possible to take over an existing GitLab
account with your LDAP credentials, as long as the GitLab account email
address matches the LDAP user email address.
 2014-08-29 15:38:05 +02:00
Jacob Vosmaer 47ac48c031 Disable allow_username_or_email_login in example 
The example LDAP configuration in gitlab.yml enables the
allow_username_or_email_login setting. Because the effect of this
setting is somewhat counterintuitive, I propose we make 'false' the
example default. The settings initializer already sets this setting to
'false'.
 2014-08-29 15:38:05 +02:00
Andrew Kumanyaev 039976af46 Return extra empty line in blob render 2014-08-29 17:17:43 +04:00
Dmitriy Zaporozhets 8aca1ff003 Merge branch 'deny-system-notes-edit' into 'master' 
Don't allow edit of system notes

Fix #1412

See merge request !1052
 2014-08-29 13:16:26 +00:00
Dmitriy Zaporozhets dc22419c25 Merge branch 'redis/cache_settings' into 'master' 
Move cache setup to config/application.rb

See merge request !1050
 2014-08-29 12:52:46 +00:00
Dmitriy Zaporozhets ad98c8c9ef Merge branch 'improve-issue-ui' into 'master' 
Improve issue ui

Fix code overflow for description block

See merge request !1051
 2014-08-29 12:45:54 +00:00
Dmitriy Zaporozhets 49313946da Remove unnecessary color styling for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:26:24 +03:00
Dmitriy Zaporozhets 01520d5d77 Dont allow edit or remove of system notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 15:19:35 +03:00
Dmitriy Zaporozhets d5be6d90bc Merge branch 'visibility-fix' into 'master' 
Visibility fix

Fixes #1529

See merge request !1049
 2014-08-29 11:59:04 +00:00
Dmitriy Zaporozhets fc76267288 Pre-wrap code blocks in issue description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 14:55:54 +03:00
Jan-Willem van der Meer 6840a276d5 Fix naming convention of LDAP tests 2014-08-29 13:49:01 +02:00
Dmitriy Zaporozhets 36361f4e45 Prevent 500 error when browse wiki page with repo access 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-29 12:58:47 +03:00
Jacob Vosmaer 185e7681d2 Move cache setup to config/application.rb 
Before this change we were trying to configure Rails.cache in an
initializer. It seems that by the time the initializers are loaded,
Rails.cache is already instantiated, so changing the settings does not
achieve anything anymore. This was causing Rails to default to a file
storage cache instead of the Redis cache, which in turn broke `rake
cache:clear`.
 2014-08-29 11:38:21 +02:00
Andrew Kumanyaev 8d715fb104 Update redcarper gem 2014-08-28 23:30:18 +04:00
Job van der Voort 68fd66c6e3 block visibility level restriction override in controller 2014-08-28 20:33:41 +02:00