home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +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
Douwe Maan 99b8568ff7 Find correct group membership. 2015-10-18 12:19:30 +02:00
Douwe Maan 5c4bb6df0d Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-button 2015-10-18 12:18:35 +02:00
Douwe Maan 024b6fa11a Add changelog item 2015-10-18 12:06:47 +02:00
Douwe Maan 7ccfbcccef Add help text to admin settings notification email. 2015-10-18 11:59:07 +02:00
Douwe Maan 551512b147 Validate admin notification email. 2015-10-18 11:58:59 +02:00
Douwe Maan 3b1c702572 Fix spec. 2015-10-18 11:58:53 +02:00
Douwe Maan 9f6dc2a4b2 Only pass abuse report ID to AbuseReportMailer. 2015-10-18 11:58:45 +02:00
Douwe Maan dc170516ed Add HTML abuse report notification email. 2015-10-18 11:58:24 +02:00
Douwe Maan 6ad683bf13 Tweak email body. 2015-10-18 11:58:14 +02:00
Douwe Maan df9062d0b5 Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify 2015-10-18 11:31:49 +02:00
Douwe Maan f52b07cedc Fix readme spec 2015-10-18 11:22:40 +02:00
Douwe Maan ff866faf2f Only load tree when project has repository to prevent 404 2015-10-18 11:22:33 +02:00
Dmitriy Zaporozhets 38785046f7 Merge branch 'outdated-discussion-padding' into 'master' 
Fix padding of outdated discussion item.

Old:

![Screen_Shot_2015-10-16_at_09.29.17](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d715debebe54d27c2eed7c22843e886c/Screen_Shot_2015-10-16_at_09.29.17.png)

New:

![Screen_Shot_2015-10-16_at_09.29.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7c0c033adade92cb16406c027cb4c010/Screen_Shot_2015-10-16_at_09.29.23.png)

It still looks the same when the discussion is expanded.

See merge request !1614
 2015-10-17 19:03:28 +00:00
Dmitriy Zaporozhets 64c2bccdd9 Merge branch 'fix-issue-3067' into 'master' 
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.

Note: I was only able to duplicate the issue on GitLab.com, but I haven't been able to replicate it anywhere else. Presumably this bug happens when the `WHERE` clause takes some time to search for the right entry and multiple requests get sent simultaneously. Need to verify whether this fix truly solves the issue.

Closes #3067

See merge request !1628
 2015-10-17 18:00:02 +00:00
Douwe Maan aebe0ddc33 Make spec names more clear 2015-10-17 19:27:02 +02:00
Douwe Maan 58cdfba9b9 Tweak help text. 2015-10-17 19:19:44 +02:00
Douwe Maan afb33acae6 Put grey block around blob ref switcher and breadcrumb. 2015-10-17 19:18:57 +02:00
Douwe Maan 33fd13c8f4 Remove border at bottom of readme. 2015-10-17 19:18:37 +02:00
Douwe Maan f009b6e256 Tweak styling of project home files list. 2015-10-17 19:18:28 +02:00
Douwe Maan a22fe254c1 Use same style for project readme, tree readme and regular blob. 2015-10-17 19:17:47 +02:00
Douwe Maan 7b26414c15 Split up projects/tree/_tree partial. 2015-10-17 19:17:13 +02:00
Douwe Maan 6bd9a9fbf7 Set vars used by tree view in project show action. 2015-10-17 19:16:40 +02:00
Douwe Maan 6f0856535e Remove redundant helper method. 2015-10-17 19:16:04 +02:00
Douwe Maan cfa3602a13 Move last push info at top of project page. 2015-10-17 19:15:32 +02:00
Douwe Maan 70240f433c Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-files 2015-10-17 18:20:04 +02:00
Stan Hu 5f47b61cef Use a relative link instead of full URL with New Issue button to be consistent 
Relates to #3095
 2015-10-17 07:19:04 -07:00
Douwe Maan 5ad3a274b3 Merge branch 'rs-redactor-filter' into 'master' 
Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects

Related: !1014

See merge request !1090
 2015-10-17 11:55:55 +00:00
Dmitriy Zaporozhets 5d010ecd8a Merge branch 'redirect-ci-dash' into 'master' 
Temporary bring /ci page page with help information

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

See merge request !1630
 2015-10-17 10:23:53 +00:00
Dmitriy Zaporozhets 5e74c5c4db Merge branch 'redirect-ci-page' into 'master' 
Redirect old CI project route to GitLab project

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

See merge request !1629
 2015-10-17 09:12:29 +00:00
Dmitriy Zaporozhets e9be3ec8ee Temporary bring /ci page page with help information 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-17 11:12:08 +02:00
Dmitriy Zaporozhets fbd9d3ec0d Merge branch 'hide-builds-tab' into 'master' 
Hide Builds tab is GitLab CI is not enabled

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

See merge request !1627
 2015-10-17 08:34:39 +00:00
Dmitriy Zaporozhets 748631b5a3 Redirect old CI project route to GitLab project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-17 10:21:01 +02:00
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
Dmitriy Zaporozhets efd5472c4b Hide Builds tab is GitLab CI is not enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-17 09:38:29 +02:00
Han Loong Liauw 02e8beaa0b Merge branch 'master' into remove-forks-from-projects-settings 2015-10-17 09:32:31 +11:00
Han Loong Liauw 1565a95da1 Merge branch 'master' into add-dates-snippets-show 2015-10-17 09:30:43 +11: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
Jacob Vosmaer 58260a0327 Do no rely on basename of builds, uploads 2015-10-16 17:16:17 +02: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
Kamil Trzcinski 6909b30993 Fix missing commit status for widget when no CI service is enabled 2015-10-16 16:39:50 +02:00