home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 12:36:27 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,849 Commits 48 Branches 340 Tags
ca3ce5c26c60de421e010491cf9166f2090c8cc8
Commit Graph
19849 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan Hu ca3ce5c26c Fix nonatomic database update potentially causing project star counts to go negative 
The counter_cache decrement function is called when a project star is deleted,
but there was no guarantee multiple workers would not attempt to delete the
same item simultaneously. Use an atomic update to prevent the count from going negative.

Closes #3067
 2015-10-17 00:58:14 -07:00
Robert Speicher c856a7a593 Merge branch 'filter-label' into 'master' 
Allow dashboard and group issues/MRs to be filtered by label

See merge request !1591
 2015-10-16 21:29:47 +00:00
Robert Speicher 292b9da54a Merge branch 'fix_svn_link' into 'master' 
Fix import from SVN link

See merge request !1617
 2015-10-16 21:17:50 +00:00
Yorick Peterse 2e1e3c4486 Merge branch 'friday-meltdown-indexes' into 'master' 
See merge request !1623
 2015-10-16 20:29:10 +00:00
Robert Speicher f84ed86a52 Merge branch 'gghs-0.3.0' into 'master' 
Use gitlab-git-http-server 0.3.0 for GitLab 8.1

See merge request !1605
 2015-10-16 20:14:37 +00:00
Yorick Peterse f405954764 Added indexes for notes.line_code and CI columns 
This adds indexes for the following columns:

* notes.line_code
* ci_projects.gitlab_id
* ci_projects.shared_runners_enabled
* ci_builds.type
* ci_builds.status
 2015-10-16 21:58:30 +02:00
Robert Speicher b39860b01b Merge branch 'gitlab-git-http-server-version' into 'master' 
Track compatible gitlab-git-http-server version

The 'git archive' changes in GitLab 8.1 require a version of
gitlab-git-http-server that is incompatible with GitLab 8.0, so we
need to keep track of this now.

See merge request !1603
 2015-10-16 19:37:22 +00:00
Dmitriy Zaporozhets dad30ec0d6 Merge branch 'improve-typography' into 'master' 
Improve typography



See merge request !1622
 2015-10-16 15:21:46 +00:00
Dmitriy Zaporozhets 2ff13cb37e Merge branch 'fix-wiki-padding' into 'master' 
Dont put padding on typography but on holder elements instead

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

Fixes wrong padding of wiki content. 


cc @JobV @skyruler 

See merge request !1620
 2015-10-16 15:20:52 +00:00
Dmitriy Zaporozhets efc31446a3 Merge branch 'compact-select' into 'master' 
Make selectbox options more compact

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

See merge request !1619
 2015-10-16 15:20:09 +00:00
Dmitriy Zaporozhets f666460171 Increase dropdown padding a bit 2015-10-16 15:18:21 +00:00
Dmitriy Zaporozhets 5bf3906a48 Merge branch 'comment-highlight' into 'master' 
Highlight comment based on anchor in URL

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

Fix for #2954 

See merge request !1618
 2015-10-16 15:12:13 +00:00
Dmitriy Zaporozhets 1543989d63 Improve markdown typography scss 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 17:06:24 +02:00
Dmitriy Zaporozhets b4cc05e56e Add extra padding to some markdown pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 16:36:37 +02:00
Dmitriy Zaporozhets db1e7fb8dd Dont put padding on typography but on holder elements instead 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 16:25:57 +02:00
Yorick Peterse f0bfbd72bc Merge branch 'ci-commits-gl-project-id-index' into 'master' 
Add index on ci_commits.gl_project_id



See merge request !1616
 2015-10-16 14:21:11 +00:00
Dmitriy Zaporozhets f5b9c3d59d Make selectbox options more compact 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 16:15:30 +02:00
Dmitriy Zaporozhets 46d748dc2e Highlight comment based on anchor in URL 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 16:06:11 +02:00
Drew Blessing a7fafee521 Fix import from SVN link 2015-10-16 08:45:50 -05:00
Yorick Peterse c6be5006da Add index on ci_commits.gl_project_id 
Fixes #3086
 2015-10-16 15:29:50 +02:00
Dmitriy Zaporozhets e10f5f4f56 Merge branch 'last-commit-project-page' into 'master' 
Show last commit from default branch on project home page

Implements #2705 

Screenshot: 

![Screenshot_2015-10-15_19.03.29](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef1cfa6764ab0ec5e7584ae61980a47d/Screenshot_2015-10-15_19.03.29.png)


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

cc @skyruler 

See merge request !1610
 2015-10-16 13:21:37 +00:00
Dmitriy Zaporozhets 47e17103f5 Change order of sha and commit message on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 13:36:48 +02:00
Dmitriy Zaporozhets 66584f72fd Add changelog item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 11:15:12 +02:00
Douwe Maan 0c2df939df Merge branch 'notify-mr-upon-branch-presence-change' into 'master' 
Add a system note and update relevant merge requests when a branch is deleted or re-added

If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

The new messages look like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6581eea069cd8e485b7fa4187ed4c043/image.png)

Closes #2926 

See merge request !1601
 2015-10-16 09:03:24 +00:00
Dmitriy Zaporozhets d1450af81f Add tests for last commit info on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 10:10:33 +02:00
Stan Hu f726df26c2 Reorder system note verb to say "Restored source branch X" instead of "Source branch X restored" 2015-10-16 00:51:25 -07:00
Stan Hu 888c1a3fc5 Add spec for refresh service adding notes to restored branches 2015-10-16 00:33:58 -07:00
Stan Hu bf290a52b7 Rubocop fix 2015-10-15 23:54:13 -07:00
Stan Hu 577565d939 Add system notes for restored branches 2015-10-15 23:54:13 -07:00
Stan Hu 9c67f4fb51 Memoize merge request source branches 2015-10-15 23:54:13 -07:00
Stan Hu effa94bb87 Improve SystemNote interface for branch add/restore case 2015-10-15 23:54:13 -07:00
Stan Hu 22775c596f Preserve target branch 2015-10-15 23:54:13 -07:00
Stan Hu 2611d9f63c Add a system note and update relevant merge requests when a branch is deleted or re-added 
If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

Closes #2926
 2015-10-15 23:54:13 -07:00
Stan Hu bd3689e9e0 Merge pull request #9740 from ashleyhindle/patch-1 
Changed loose to lose
 2015-10-15 23:38:15 -07:00
Ashley Hindle a317c5296e Changed loose to lose 2015-10-16 07:36:20 +01:00
Robert Speicher 94ec666923 Merge branch 'when-syntax' into 'master' 
Implement when syntax in .gitlab-ci.yml

See merge request !1606
 2015-10-16 03:01:24 +00:00
Robert Speicher 64352d25b3 Correct spec description typo 
[ci skip]
 2015-10-15 21:30:47 -04:00
Robert Speicher 6fe2a679a7 Update CI YAML docs 2015-10-15 19:46:01 -04:00
Robert Speicher 62377d1754 Shut up, Rubocop 2015-10-15 19:44:15 -04:00
Robert Speicher c2c9f6d52d Remove 8.0-only steps from the 8.1 update guide 
Also adds a preamble note that a working 8.0 installation (i.e.,
gitlab-git-http-server, updated Nginx/Apache configs) is required before
proceeding.

[ci skip]
 2015-10-15 18:59:28 -04:00
Robert Speicher 6232bb1ef3 Remove notes about CI migration from 8.1 update guide 
[ci skip]
 2015-10-15 18:18:41 -04:00
Kamil Trzcinski 374ea21f32 Backticks around when types 2015-10-15 23:56:42 +02:00
Kamil Trzcinski 9419046196 Fix specs 2015-10-15 23:51:45 +02:00
Kamil Trzcinski 0aa6061d6a Implement when syntax in .gitlab-ci.yml 2015-10-15 23:49:39 +02:00
Robert Speicher 3d76390798 Merge branch 'sentences-end-in-periods' into 'master' 
Sentences end in periods.

[ci skip]

See merge request !1604
 2015-10-15 20:21:10 +00:00
Robert Speicher 9900a8531a Merge branch 'rs-prepare-8-1-0' into 'master' 
Prepare 8.1 documentation

[ci skip]

See merge request !1612
 2015-10-15 20:16:29 +00:00
Robert Speicher 8b54063453 Merge branch 'update-redcarpet' into 'master' 
Update redcarpet gem. Fixes gem memory leak

Fixes #2773 

See merge request !1607
 2015-10-15 20:14:42 +00:00
Robert Speicher facf8826da Add 8.0-to-8.1 update guide 2015-10-15 16:06:34 -04:00
Robert Speicher 6348f654cd Update Installation doc for 8-1-stable 2015-10-15 15:59:06 -04:00
Dmitriy Zaporozhets 9fd4822986 Show last commit from default branch on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-15 19:02:29 +02:00