home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,206 Commits 48 Branches 340 Tags
d4d723caeed66ea215561689947b35dc8bde7404
Commit Graph
11206 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets 04a87cb5c4 Round avatars for notes timeline 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:15 +03:00
Dmitriy Zaporozhets a7dcf690fb Fix discussion style for timeline 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:14 +03:00
Dmitriy Zaporozhets 207d798dc4 Basic UI implememntation of comments in timeline style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:14 +03:00
Sytse Sijbrandij 099e17038f Add note about testing the migrations. 2014-08-26 10:20:55 +02:00
Sytse Sijbrandij 075e5eeccb Change the version before creating the stable branch. 2014-08-26 10:04:57 +02:00
Robert Schilling 23d4fcbd2c Merge pull request #7600 from Razer6/doc/pkg-confif_dependency 
Add pkg-config as required dependency for rugged
 2014-08-26 06:14:49 +02:00
Robert Schilling 1646009724 Add pkg-config as required dependency for rugged 2014-08-26 06:10:53 +02:00
Dmitriy Zaporozhets b5cc813612 Merge branch 'drop_post_recieve_jobs' into 'master' 
Add rake task to drop a project's PostReceive jobs

If a user pushes so many branches/tags to a project that Sidekiq
gets clogged, you can use this script to drop _all_ PostReceive
jobs for a given project.

See merge request !1030
 2014-08-25 18:55:13 +00:00
Dmitriy Zaporozhets 5087f36d23 Merge branch 'annotate' into 'master' 
Annotate

See merge request !1040
 2014-08-25 10:33:53 +00:00
Dmitriy Zaporozhets 3fd929fd76 Merge branch 'fork-star-bug' into 'master' 
Fork star bug

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/523

See merge request !1039
 2014-08-25 10:33:31 +00:00
Dmitriy Zaporozhets 92deb451da Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:25:02 +03:00
Dmitriy Zaporozhets 2e497d8438 Prevent project stars duplication when fork project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:19:52 +03:00
Sytse Sijbrandij 1a9b2a47a1 Merge pull request #7594 from bbodenmiller/patch-3 
Monthly active users -> Active users last 30 days
 2014-08-25 09:43:18 +02:00
Ben Bodenmiller c1eee5968f Monthly active users -> Active users last 30 days 
Clarify what `Monthly active users` means by changing to `Active users last 30 days`.
 2014-08-24 22:42:46 -07:00
Robert Schilling a25e6f725a Merge pull request #7593 from bbodenmiller/patch-3 
remove extra cd's to GitLab installation folder
 2014-08-24 22:40:49 +02:00
Ben Bodenmiller c8c2b49dfb remove extra cd's to GitLab installation folder 2014-08-24 13:31:25 -07:00
Sytse Sijbrandij 8b1fe5f4ff Merge pull request #7569 from offlinehoster/patch-2 
Added AsciiDoc support and changed to singlequotes
 2014-08-24 11:57:54 +02:00
Robert Schilling a820a15dc0 Merge pull request #7582 from bbodenmiller/patch-5 
[Documentation] more cleanup installation guide formatting
 2014-08-24 10:59:45 +02:00