Commit Graph
149 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
Dmitriy Zaporozhets e02cff19ed Fix typo in text when raise pre-receive exception
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 10:47:29 +02:00
Dmitriy Zaporozhets 3b93856e13 save repo empty state into variable for proper result
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 10:24:25 +02:00
Dmitriy Zaporozhets 9ea37cda3f merge with support of pre-receive and post-receive hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 17:52:49 +02:00
Dmitriy Zaporozhets f4149bcddc Refactor how repository makes commit with pre/post receive hooks 2015-08-14 16:23:40 +02:00
Stan Hu 6e808fc222 Clear cache to prevent listing deleted branches after MR removes source branch
Closes #2272
2015-08-14 07:09:25 -07:00
Dmitriy Zaporozhets 34690142bf Implement commit transaction with pre-receive and post-receive hooks for web editor
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-13 12:57:24 +02:00
Florent (HP) 8adf6ba8f5 Add merged label on branches page 2015-08-11 23:00:46 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9bc512314a Revert "Create and edit files in web editor via rugged"
This reverts commit 734a4ba87d.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 11:52:33 +02:00
Dmitriy Zaporozhets 1891cab44c Fix conflict issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 11:12:35 +02:00
Dmitriy Zaporozhets 3b02ad8467 Revert "Merge branches inside one repository using rugged instead of satellites"
This reverts commit d24c40ec21.
2015-08-11 10:50:39 +02:00
Dmitriy Zaporozhets 32046983ad Revert "Merge branch 'refactor-can-be-merge' into 'master'"
This reverts commit 459e6d3467, reversing
changes made to 804168e1de.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:48:02 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
Stan Hu e1811316d7 Remove repository graph log to fix slow cache updates after push event
Recalculating graph_log took minutes on a large repository since each
of the 6000 commits would need to calculate the diff. Since graph_log
does not appear to be used, remove it from the list of things to update.
For the Linux kernel repository, this reduced the ProjectCacheWorker time
from 8+ minutes to 16 seconds.

Closes #2016
2015-07-19 22:53:14 -07:00
Dmitriy Zaporozhets 67fb9ef266 Merge branch 'even-faster-search' into 'master'
Avoid copy of strings in memory for parsing git grep result

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !967
2015-07-17 16:22:45 +00:00
Dmitriy Zaporozhets f0116f1335 Store commit count in project table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17 15:22:56 +02:00
Dmitriy Zaporozhets 67ca5a53f6 Build missing cache items in background job after each push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17 14:50:03 +02:00
Dmitriy Zaporozhets 26f5d6047d Refactor compare and fetch logic 2015-07-15 17:28:09 +02:00
Dmitriy Zaporozhets 2a6f522cac Implement merge from forks without satellites 2015-07-15 16:45:50 +02:00
Dmitriy Zaporozhets 277f311f20 Fetch reference from fork repo when create merge request 2015-07-15 15:27:14 +02:00
Dmitriy Zaporozhets bbd3d2c39d Avoid copy of strings in memory for parsing git grep result
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-13 11:27:25 +02:00
Dmitriy Zaporozhets ec19a960ca Add tests for repository search files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-12 14:32:25 +02:00
Dmitriy Zaporozhets 9ab12e099d Fix search blobs for wiki
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-12 14:01:06 +02:00
Dmitriy Zaporozhets f6609c9882 Implement search of code via git grep
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-10 17:50:50 +02:00
Dmitriy Zaporozhets 2e6bbb12f8 Refactor can_be_merged logic for merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 17:24:03 +02:00
Dmitriy Zaporozhets d24c40ec21 Merge branches inside one repository using rugged instead of satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 16:23:58 +02:00
Dmitriy Zaporozhets baf12f45d8 Repository#blob_at should return nil for 00000000... sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 11:02:37 +02:00
Douwe Maan 0734756ee4 Convert CRLF newlines to LF when committing using the web editor. 2015-06-20 14:35:24 +02:00
Robert Speicher 33df3ed384 Add respond_to_missing? for Commit and Repository
As of Ruby 1.9, this is the correct way to handle `respond_to?` for
methods implemented by `method_missing`.

See https://robots.thoughtbot.com/always-define-respond-to-missing-when-overriding
2015-06-10 01:31:27 -04:00
Dmitriy Zaporozhets 8997812626 Remove files in web editor using rugged
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02 11:41:21 +02:00
Dmitriy Zaporozhets 734a4ba87d Create and edit files in web editor via rugged
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-01 20:49:11 +02:00
Douwe Maan 84a1590252 Let commit model know about its project. 2015-04-24 12:29:36 +02:00
Douwe Maan 0ece6bd828 Use \A and \z in regexes instead of ^ and $. 2015-04-10 18:31:07 +02:00
Douwe Maan 2cfd0b59ae Archive repositories in background worker. 2015-03-31 12:52:20 +02:00
Dmitriy Zaporozhets 64891c6c40 Replace commits calendar with contributions calendar
* count opening of issues and merge requests
* dont trigger git repository - use events from database
* much-much faster since does not affected by repository size
2015-03-21 23:48:08 -07:00
Dmitriy Zaporozhets d96098e966 Cache head commit and head tree 2015-03-21 13:45:08 -07:00
Dmitriy Zaporozhets c378d20c84 Cache lookup results into hash to prevent repeating same requests to git repo 2015-03-21 13:44:51 -07:00
Dmitriy Zaporozhets 2c796a1785 Cache project branches and tags into variables 2015-03-21 13:44:11 -07:00
Dmitriy Zaporozhets d03d636304 Merge branch 'changelog-link' into 'master'
Add changelog, license and contribution guide links to project sidebar.

If the version is known, the "Version: 7.9.0pre" button links to the changelog, otherwise a "View changelog" button is shown.

![Screen_Shot_2015-03-18_at_14.22.29](https://dev.gitlab.org/gitlab/gitlabhq/uploads/747acc018ec9a188098e0f0bc4e91cc3/Screen_Shot_2015-03-18_at_14.22.29.png)

See merge request !1708
2015-03-18 18:02:39 +00:00
Douwe Maan b1b8261f56 Add license and contribution guide links to project sidebar. 2015-03-18 16:17:43 +01:00
Douwe Maan 6581aea3bf Link project version to changelog if there is one. 2015-03-18 14:08:26 +01:00
Douwe Maan 88f9ed3d19 Move finding of contributing file from tree to repository. 2015-03-18 14:08:26 +01:00
Hannes Rosenögger 9e5738b007 Extend the commit calendar to show the actual commits for a date 2015-03-18 08:42:42 +01:00
Douwe Maan f96dc6295a Everything from gitlab_git is already UTF-8. 2015-03-13 13:49:27 +01:00
Stan Hu b26ab0ceeb This MR extends the commit calendar so it searches for commits made with every email address the user has associated with his account.
This fixes one of the problems mentioned in gitlab-org/gitlab-ce#1162 and makes the behavior of the commit calendar as described in the profile.
"All email addresses will be used to identify your commits."
2015-03-09 21:43:54 -07:00
Hannes Rosenögger 10212c01fd Count commits in branches as well in the commit calendar 2015-03-03 15:31:05 +01:00
Dmitriy Zaporozhets 1511506f72 Fix git syntax issue 2015-02-25 15:17:20 -08:00