home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets d23ffc832c Fix code that depends on incorrect inflector behavior 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-03 12:00:27 +01:00
Yorick Peterse a2f8f9ad3d Fixed User sorting specs 
The descriptions were not accurate and one particular spec seemingly
expected the wrong User row to be returned.
 2015-11-03 11:56:04 +01:00
Yorick Peterse 732f5380af Only sort by IDs by default 
Sorting by both "created_at" and "id" in descending order is not needed
as simply sorting by "id" in descending order will already sort rows
from new to old. Depending on the query and data involved sorting twice
can also introduce significant overhead.
 2015-11-03 11:54:43 +01:00
Yorick Peterse 0df65909ef Added benchmark for User.all 
This benchmark exists to test if ordering has any noticeable impact in
the test environment.
 2015-11-03 11:47:23 +01:00
Dmitriy Zaporozhets 8a22b5bf54 Remove inflector rule that makes commits uncountable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-03 11:36:20 +01:00
Dmitriy Zaporozhets fb2f8be4d7 Merge branch 'olhado/gitlab-ce-commit-search' 2015-11-03 11:28:56 +01:00
Dmitriy Zaporozhets d0e74f49b4 Merge branch 'new-file-link' into 'master' 
Add 'New file' link to dropdown on project page

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

Screenshot: 

![Screenshot_2015-11-02_15.33.41](/uploads/ecc87c6bda9e3f0680e5422d5cdc08f9/Screenshot_2015-11-02_15.33.41.png)


Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2562

See merge request !1719
 2015-11-03 10:26:16 +00:00
Valery SizovandValery Sizov 9479496f75 Add added, modified and removed properties to commit object in webhook 2015-11-03 12:16:40 +02:00
Kamil Trzcinski fe34b745e7 Fix tests 2015-11-03 11:05:54 +01:00
Kamil Trzciński b9e53258c5 Merge branch 'update-links-to-ci-status' into 'master' 
Update links in CI docs after GitLab 8.1

Fix that some links to CI status in docs were broken even after following redirects.

As CI build overview is now missing (cf. #3008), this MR uses `?scope=all` parameter.

See merge request !1733
 2015-11-03 09:51:47 +00:00
Dmitriy Zaporozhets 28f6fba97c Fix commits search for empty repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-03 10:16:09 +01:00
Dmitriy Zaporozhets d0398514b8 Add 'New file' link to dropdown on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-03 09:21:35 +01:00
Dmitriy Zaporozhets 57430dc4da Merge branch 'rs-require-backup-files' into 'master' 
Explicitly require backup/files

Fixes a test failure we were seeing on CI after merging !1520

See merge request !1731
 2015-11-03 08:16:44 +00:00
Stan Hu aa27108e6b Merge pull request #9791 from konpyu/fix-deprecated 
Fix deprecated `prepend_before_filter` -> `prepend_before_action`
 2015-11-02 23:47:37 -08:00
Takuya Noguchi f61aa9acdc Update links in CI docs after GitLab 8.1 2015-11-03 14:01:27 +09:00
Jeff Stubler 860e24cc7b Merge branch 'master' into diverging-branch-graphs 2015-11-02 20:21:03 -06:00
Robert Speicher 60c5b52ee9 Explicitly require backup/files 2015-11-02 15:04:43 -05:00
Zeger-Jan van de Weg 63b234706d MRs author can cancel automatic merge 2015-11-02 20:15:40 +01:00
Douglas Barbosa Alexandre 48c3bfe5bd Merge branch 'master' into fix-personal-snippet-access-workflow 2015-11-02 17:06:41 -02:00
Dmitriy Zaporozhets 5782217bfc Merge branch 'api_file_touched_at' into 'master' 
Add ability to fetch the commit ID of the last commit that actually touched a file

https://dev.gitlab.org/gitlab/gitlabhq/issues/2564

See merge request !1718
 2015-11-02 17:58:32 +00:00
Zeger-Jan van de Weg 77f8a1e392 Merge when build succeeds 2015-11-02 17:27:38 +01:00
Douglas Barbosa Alexandre 091979bd1b Fix ability name for public or internal personal snippets 2015-11-02 14:04:45 -02:00
Jacob Vosmaer 63cafdb8e5 Add changelog entry for contacted_at 2015-11-02 17:04:28 +01:00
Douglas Barbosa Alexandre 93672c5020 Use read rather than show like the ability name 2015-11-02 14:03:42 -02:00
Dmitriy Zaporozhets 810c91fe35 Refactor search by commits message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-02 16:39:24 +01:00
Valery SizovandValery Sizov 1b8d324762 Add ability to fetch the commit ID of the last commit that actually touched a file 2015-11-02 17:07:06 +02:00
Jacob Vosmaer e032a7288f Spread out runner contacted_at updates 2015-11-02 16:02:47 +01:00
Kamil Trzcinski 1056c9d2d2 Spelling 2015-11-02 15:49:54 +01:00
Jeroen van Baarsen 2dec5ec990 Only redirect to homepage url when its not the root url 
It was possible to create an infi redirect when the user set up the
`home_page_url` to redirect to the main URL of the gitlab instance.

This fix makes sure this redirect is not possible.

Fixes !1020

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-11-02 15:42:30 +01:00
Dmitriy Zaporozhets a9f02300c8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-02 15:15:09 +01:00
Kamil Trzcinski c03da1caad Extend yml syntax for only and except to support specifying repository path 2015-11-02 14:44:06 +01:00
Kamil Trzciński edab429c97 Merge branch 'backup-improvements' into 'master' 
Reduce disk IO and space usage during backups

This is based on improvements made to the GitLab CI 8.0 backup script.

- Avoid creating many small intermediate files while backing up builds and uploads by using tar and light gzip compression
- Use same backup/restore code for uploads and builds
- Only store a compressed intermediate DB dump

See merge request !1520
 2015-11-02 13:02:25 +00:00
Douwe Maan 329e067ff1 Merge branch 'rs-dev-issue-2613' into 'master' 
Add custom protocol whitelisting to SanitizationFilter

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613

We allow any protocol for autolinks: irc://irc.freenode.net/git

But manual Markdown links with the same protocol get sanitized: `[This will not be clickable](irc://irc.freenode.net/git)`: [This will not be clickable](irc://irc.freenode.net/git)

To get around this we have to first allow *all* protocols, and then manually clean dangerous (i.e., `javascript:`) protocols.

See merge request !1496
 2015-11-02 10:49:46 +00:00
Douwe Maan cbd1c3e31e Merge branch 'rs-editor-submit' into 'master' 
Persist blob editor's value on submit, not on click

Prior, the value of the Ace editor was only being persisted if the user
physically clicked the submit button, which the "quick submit" behavior
doesn't do.

Now the value will be properly transferred before any form is submitted.

See merge request !1712
 2015-11-02 10:49:30 +00:00
Robert Schilling 65808019ad Merge pull request #9794 from arnaud-zg/master 
Go to gitlab installation folder before initialize database
 2015-11-02 10:12:18 +01:00
zheng_b 1045a72eb7 Go to gitlab installation folder before initialize database 2015-11-02 07:59:04 +01:00
Jeff Stubler c843722de2 Add graphs showing commits ahead and behind default to branches page 2015-11-01 11:38:00 -06:00
Jan-Gerd Tenberge 3b717c8a8c Fix typo 2015-11-01 02:42:36 +01:00
Achilleas Pipinellis 8f75200d46 Merge branch 'doc-Gitlab-2-GitLab' into 'master' 
Gilab -> GitLab

Replace `Gitlab` with `GitLab`

See merge request !1715
 2015-11-01 00:33:16 +00:00
Achilleas Pipinellis c3d5dac185 Merge branch 'fix-doc-typo' into 'master' 
Fix typo in rake task doc



See merge request !1713
 2015-11-01 00:31:19 +00:00
Robert Schilling a1d0eca886 Gilab -> GitLab 2015-10-31 23:31:21 +01:00
Robert Schilling 98008a2db8 Fix typo in rake task doc 2015-10-31 22:56:24 +01:00
Achilleas Pipinellis 1f8689693a Merge branch 'fix-deadlink-in-docs-ci-examples' into 'master' 
Fix deadlink in docs for ci/examples

Just fix a deadlink in docs for ci/examples.

See merge request !1710
 2015-10-31 15:38:57 +00:00
Robert Speicher 3b0039f659 Persist blob editor's value on submit, not on click 
Prior, the value of the Ace editor was only being persisted if the user
physically clicked the submit button, which the "quick submit" behavior
doesn't do.

Now the value will be properly transferred before any form is submitted.
 2015-10-31 16:08:34 +01:00
KON YUICHI 31723eb9f0 fix deprecated 2015-10-31 22:32:06 +09:00
Dmitriy Zaporozhets 7335395916 Merge branch 'gitlab-workhorse' into 'master' 
Switch to gitlab-workhorse

This is a little annoying but it is better to change this name then
to be stuck with a bad name for a long time. Reasons for the name
change: https://gitlab.com/gitlab-org/gitlab-git-http-server/issues/13

See merge request !1707
 2015-10-30 21:23:53 +00:00
James Lopez 6aa9c21ac0 fix issue with adding members to project (spotted by test) 2015-10-30 19:55:19 +00:00
Yorick Peterse a0ba6c6c19 Merge branch 'optimize-user-find-by-any-email' into 'master' 
Improve performance of User.find_by_any_email



See merge request !1698
 2015-10-30 17:28:30 +00:00
Takuya Noguchi 31ea88cfed Fix deadlink in docs for ci/examples 2015-10-31 02:27:44 +09:00
Thirumal S 74416daa66 form group alignment issue fixed in webhook index page 2015-10-30 19:26:56 +05:30