home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben Bodenmiller 6682f8d75d add missing config files to check during release process 2014-08-28 17:21:16 -07: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
Jacob Vosmaer d4180875cb Merge branch 'fix-xss' into 'master' 
Fix XSS issue

When view blob as RAW make sure we allow only 2 kind of type: 'text/plain' and 'application/octet-stream'

Fixes #1514

See merge request !1045
 2014-08-28 15:59:57 +00:00
Dmitriy Zaporozhets 3069826d1a Merge pull request #7378 from jojosch/nginx-ssl-redirect 
Use a ? after the $request_uri to perform a valid Redirect while cloning...
 2014-08-28 16:54:36 +03:00
Dmitriy Zaporozhets ef4848a6ff Merge pull request #7609 from cirosantilli/rm-haml-strings 
[refactor] Remove HAML eval for const strings.
 2014-08-28 16:52:18 +03:00
Dmitriy Zaporozhets c8514bece9 Merge pull request #7621 from dreis2211/overflow-my-projects-list 
Fix overflow in 'my projects' list
 2014-08-28 16:51:56 +03:00
Dmitriy Zaporozhets 1438285de1 Merge pull request #7601 from yglukhov/hide_pass 
Mask password in import URL while importing.
 2014-08-28 16:50:19 +03:00
Dmitriy Zaporozhets 22a7fcab8c Merge pull request #7620 from zzet/patch-11 
Add search in textarea
 2014-08-28 16:49:42 +03:00
Dmitriy Zaporozhets da55f2d9b0 Fix fork button for project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 16:46:06 +03:00
Dmitriy Zaporozhets 0d5253812b Merge branch 'project-home-redesign' into 'master' 
Project home redesign

* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab

Fixes #1534.

See merge request !1047
 2014-08-28 13:40:38 +00:00
Dmitriy Zaporozhets 2dc4c65aa5 fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 15:58:23 +03:00
Dmitriy Zaporozhets 48f8c5a873 Improve project sidebutton colors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 15:10:47 +03:00
Dmitriy Zaporozhets c1d2640b2e Merge branch 'redis_settings' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-08-28 15:03:22 +03:00
Dmitriy Zaporozhets d4a2ef5271 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 15:01:37 +03:00
Dmitriy Zaporozhets 8289308933 Restyle project home 
* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 14:19:11 +03:00
Dmitriy Zaporozhets db88190636 Merge branch 'improve-search-output' into 'master' 
Improve search output

See merge request !1046
 2014-08-28 09:10:04 +00:00
dreis 7b9a1819f7 Fix overflow in 'my projects' list 2014-08-28 10:54:21 +02:00
Andrew Kumanyaev f9c7f41476 Add missing ext for searchbox 2014-08-28 12:08:02 +04:00
Dmitriy Zaporozhets 1056d91c67 Improve search results output. Fixes some markup issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 11:06:19 +03:00
Dmitriy Zaporozhets 6f154c07c8 Prevent possible XSS issues by seting text/plain for all text files in 
RAW feature

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 10:42:52 +03:00
Andrew Kumanyaev 0534d75a84 Add search in textarea 
https://github.com/ajaxorg/ace/blob/master/lib/ace/commands/default_commands.js#L176-L181
 2014-08-28 11:40:05 +04:00
Jacob Vosmaer c9bf35817b Merge pull request #7619 from BlueBayTravel/taggable-migration 
Delete invalid taggings during label migration
 2014-08-28 08:32:28 +02:00
James Brooks 63e25c2bb4 Fixes #7571 2014-08-27 21:12:37 +01:00
Dmitriy Zaporozhets c9054319c8 nicer block for oauth signin links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 18:21:54 +03:00
Dmitriy Zaporozhets 5aee89d08c Make tree readme title - a link with anchor to README section 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 18:04:20 +03:00
uran e9015dfbc9 Mask password in import URL while importing. 2014-08-27 18:04:18 +03:00
Jacob Vosmaer fc62664146 Add CHANGELOG entries for Redis fixes 2014-08-27 16:53:35 +02:00
Dmitriy Zaporozhets e38081e55b More entries to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 17:38:42 +03:00
Jacob Vosmaer 0a52b70b92 Hide configuration shenanigans in a block 
I'm feeling paranoid about the scope variables like redis_config_file
get defined in. Hiding it in a block to limit the scope.
 2014-08-27 16:36:38 +02:00
Jacob Vosmaer 6d785abaa9 Rename resque_url to redis_url_string 2014-08-27 16:32:59 +02:00
Dmitriy Zaporozhets d4d723caee Merge pull request #7616 from yglukhov/fix-parallel-diff-on-new-mr 
Fixed parralel diff button on 'merge_requests/new' page
 2014-08-27 17:31:38 +03:00
Dmitriy Zaporozhets c4a8663b57 Tell travis what directory cache explicitly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 17:27:26 +03:00
Dmitriy Zaporozhets a5eb6915d0 Enable bundler caching for travis 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 17:24:54 +03:00
Dmitriy Zaporozhets f12fdf16e3 Merge branch 'improve-search-page' into 'master' 
Improve search page

Fixes #1270

* added pagination support
* filter results by type
* when switch between context - search params stays
* redesign comment search results
* search Issues and MR by description too

## Screenshots:

![Screenshot 2014-08-27 09.56.18](https://dev.gitlab.org/uploads/gitlab/gitlabhq/2053220cd4/Screenshot_2014-08-27_09.56.18.png)

![Screenshot 2014-08-27 09.56.00](https://dev.gitlab.org/uploads/gitlab/gitlabhq/726c764da4/Screenshot_2014-08-27_09.56.00.png)

See merge request !1043
 2014-08-27 14:22:58 +00:00