home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,224 Commits 48 Branches 340 Tags
da55f2d9b0ea76cdaf85651570641df9c7bb915f
Commit Graph
11224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Dmitriy Zaporozhets 67d96b0f36 Merge pull request #7611 from yglukhov/sticky-diff-headers 
Diff headers made sticky.
 2014-08-27 17:22:17 +03:00
Dmitriy Zaporozhets f089fd5fdd Merge pull request #7614 from yglukhov/toggle-line-wrap 
Added a checkbox to toggle line wrapping in diff.
 2014-08-27 17:07:46 +03:00
uran f44a68a004 Fixed parralel diff button on 'merge_requests/new' page 2014-08-27 17:00:15 +03:00
Dmitriy Zaporozhets c5c906fe64 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 15:26:35 +03:00
Dmitriy Zaporozhets 7f4b993793 Forgot to save file :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:54:18 +03:00
Dmitriy Zaporozhets 043f275900 Skip description if not exist 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:49:45 +03:00
Dmitriy Zaporozhets 8b00d01c67 Search by issue/mr title and description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets 7e59a8fee8 Improve comment search results 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:37:31 +03:00
Dmitriy Zaporozhets 13f6dc1a94 Save search options when switch between filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 11:55:42 +03:00
Yuriy Glukhovanduran 0bf45aece3 Added a checkbox to toggle line wrapping in diff. 2014-08-27 11:21:58 +03:00
Dmitriy Zaporozhets c3ad51a0e4 Improve search tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 10:48:51 +03:00
Robert Schilling 070e3964dc Merge pull request #7613 from Razer6/doc/postgres_version 
Do not specify postgres-version while installing
 2014-08-27 09:19:32 +02:00
Robert Schilling 7c1e60f0b4 Do not specify postgres-version while installing 2014-08-27 09:16:33 +02:00
Dmitriy Zaporozhets ede08dbdd7 Implement search page with filtering of results and pagination 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 09:57:50 +03:00
uran 6eb85b1a30 Diff headers made sticky. 2014-08-27 00:24:49 +03:00
Dmitriy Zaporozhets 9e5bc43263 Pass scope and page to Gitlab::SearchResults#objects instead of initialize 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 00:04:14 +03:00
Dmitriy Zaporozhets 5d9a5c02d8 Add search method to Note class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 23:39:37 +03:00
Dmitriy Zaporozhets 9a4ef7e7eb Search results libraries added 
Gitlab::SearchResults and Gitlab::ProjectSearchResults are libraries we
are going to use to get search results based on query, enitity type and
pagination.

It will allow us to get only issues from project #23 where title or
description includes 'foo'.

Ex:

search_results = Gitlab::ProjectSearchResults.new(project.id, 'foo', 'issues')

search_results.objects => # [<Issues #23>, <Issues #34>]
search_results.issues_count => 2
search_results.total_count => 12 (it includes results from comments and
merge requests too)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 23:32:41 +03:00
Dmitriy Zaporozhets b3b50bb86e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-08-26 19:02:50 +03:00
Dmitriy Zaporozhets f9a11630f7 Merge branch 'test/fix_home_dir' 2014-08-26 19:01:57 +03:00
Dmitriy Zaporozhets eabbb7beb8 Merge branch 'session_timeout' into 'master' 
Expire Rack sessions after 1 week

This has the side effect of preventing Redis from clogging up with old sessions.

See merge request !1042
 2014-08-26 16:01:01 +00:00
Jacob Vosmaer 9b75d99d72 Merge branch 'release-doc-improvements' into 'master' 
Release doc improvements

Fixes #1527

@jacobvosmaer According to the docs the RC should be deployed on .com before being announced via twitter, so I think this is already covered in the docs.

/cc @all

See merge request !1041
 2014-08-26 13:51:54 +00:00
Sytse Sijbrandij 45d887ad1c Merge branch 'master' into release-doc-improvements 
Conflicts:
	doc/release/monthly.md
 2014-08-26 15:45:58 +02:00
Jacob Vosmaer 048adf7b62 Merge branch 'release-order-in-reality' into 'master' 
Release order in reality

/cc @all

See merge request !1037
 2014-08-26 13:31:19 +00:00
Jacob Vosmaer c0b146899b Store sessions in a Redis namespace 
This makes less of a mess of the Redis root.
 2014-08-26 13:44:39 +02:00
Jacob Vosmaer 9122823afc Configure Redis cache for all environments 
Also add support for connecting to Redis with Unix sockets.
 2014-08-26 13:44:39 +02:00
Dmitriy Zaporozhets 2c7e08745b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-26 12:37:51 +03:00
Dmitriy Zaporozhets 24ecb6d467 Merge branch 'notes-timeline' into 'master' 
Notes timeline

Fixes #1496

![Screenshot 2014-08-26 09.55.27](https://dev.gitlab.org/uploads/gitlab/gitlabhq/07f0eafa78/Screenshot_2014-08-26_09.55.27.png)

See merge request !1023
 2014-08-26 09:37:36 +00:00
Jacob Vosmaer 37d6293842 Write authorized_keys in tmp/tests during tests 
This should reduce the number of gitlab-shell error messages while the
tests run.
 2014-08-26 11:33:26 +02:00
Jacob Vosmaer 99b81be887 Expire Rack sessions after 1 week 2014-08-26 10:58:16 +02:00