home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,743 Commits 48 Branches 340 Tags
78568b5611a808bf7fffcd87f3aa72febd0aea8e
Commit Graph
17743 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov 78568b5611 Merge branch 'update_stable-7-13' into '7-13-stable' 
Update stable for 7.13.2



See merge request !1056
 2015-07-28 12:00:38 +00:00
Valery Sizov ab21327628 update changelog 2015-07-28 14:57:54 +03:00
Robert SpeicherandValery Sizov abefd20fa1 Render Note field hints consistently for "new" and "edit" forms 
- The "Edit" form didn't have Markdown hints.
- The "New" form had a paperclip icon for attachments, the "edit" form
  didn't.

Closes #2010

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
 2015-07-28 14:42:14 +03:00
Marin JankovskiandValery Sizov 0fc5c80207 Remove docs and rake task for gmail actions to prevent problems with registration. 2015-07-28 14:41:53 +03:00
Marin JankovskiandValery Sizov 6e5209baca Use mdash to prevent breaking html emails. 2015-07-28 14:41:43 +03:00
Daniel GerhardtandValery Sizov 4a3f3c938a Add rake task 'gitlab:update_commit_count' 
Starting with migration `20150717130904` commit count is stored in the
database. For existing projects it defaults to `0` and is updated to the
correct value when commits are pushed.

The newly introduced rake task updates the commit count for all projects
which have not been updated yet.

Refs !986, !989, #2040.
 2015-07-28 14:41:14 +03:00
Robert SpeicherandValery Sizov bf0a5cf358 Show the first tab automatically on MergeRequests#new 
Closes #2013
 2015-07-28 14:40:45 +03:00
Robert SpeicherandValery Sizov 42c362313e Dynamically check :admin_* ability in IssuableBaseService 
Closes #2092
 2015-07-28 14:39:54 +03:00
Robert SpeicherandValery Sizov 81c861cf11 Dynamically check :admin_* ability on issuable form 
Closes #2092
 2015-07-28 14:39:45 +03:00
Robert SpeicherandValery Sizov 9079f4dd72 Add Issuable#to_ability_name 2015-07-28 14:39:38 +03:00
Stan HuandValery Sizov 1dac44bf85 Fix Error 500 when browsing projects with no HEAD 
Steps to reproduce:
1. Create a project with a README
2. In the actual remote, type: `git symbolic-ref HEAD refs/heads/nowhere`
3. Check that HEAD is gone via `git ls-remote .`
4. Go to the projects page and see the Error 500

Closes https://github.com/gitlabhq/gitlabhq/issues/9484
 2015-07-28 14:39:15 +03:00
Robert SpeicherandValery Sizov 7cf651eb27 Add "Manage merge requests" permission to docs 2015-07-28 14:38:41 +03:00
Robert SpeicherandValery Sizov 997c991ae6 Add admin_merge_request ability to Developer level and up 
This was necessary because this permission is checked dynamically by
`app/views/shared/issuable/_context` when on a Merge Request.

Closes #2058
 2015-07-28 14:38:34 +03:00
Robert SpeicherandValery Sizov 064a0774b7 Create project services on Project creation 2015-07-28 14:37:59 +03:00
Robert SpeicherandValery Sizov 67c4586406 Only create :admin user in the one test where it's used 2015-07-28 14:37:49 +03:00
Valery Sizov 6cb800a087 Merge branch 'test_stabilize_stable' into '7-13-stable' 
Fix randomly failed spec

https://gitlab.com/gitlab-org/gitlab-ce/issues/2069

See merge request !1035
 2015-07-23 14:46:22 +00:00
Valery Sizov 6150bf32d7 fix randomly failed spec 2015-07-23 16:55:39 +03:00
Valery Sizov 0687441b91 Version 7.13.1 v7.13.1 2015-07-23 16:38:04 +03:00
Valery Sizov ad2bd1939e Merge branch 'update-7-13-stable' into '7-13-stable' 
Update 7-13-stable (7.13.1)



See merge request !1033
 2015-07-23 11:32:51 +00:00
Valery Sizov 494c672e61 update changelog 2015-07-23 14:29:57 +03:00
Douwe MaanandValery Sizov 529091b6a3 Return true/false from AutoMergeService#merge! 2015-07-23 14:26:34 +03:00
Douwe MaanandValery Sizov 81666b301a Fix Remove source-branch for MRs from same project 2015-07-23 14:26:24 +03:00
Valery Sizov 602806d786 update changelog 2015-07-23 14:19:53 +03:00
Valery Sizov 53ab844064 Merge branch 'update-to-7-13-stable' into '7-13-stable' 
Update to 7-13-stable (7.13.1)



See merge request !1031
 2015-07-23 10:40:05 +00:00
Valery Sizov 4bc6d1fb3d update changelog 2015-07-23 13:08:38 +03:00
Valery Sizov f26150a7f9 update changelog 2015-07-23 11:19:55 +03:00
Valery Sizov 8d1ccf7e3a revert cache for events 2015-07-23 11:19:17 +03:00
Achilleas PipinellisandValery Sizov b50f5f9051 Fix link to 2fa help page. Closes #2055 2015-07-23 11:09:00 +03:00
Valery Sizov d303f598e0 update changelog 2015-07-23 11:08:11 +03:00
Marin JankovskiandValery Sizov 0e8dd6106b Check if session_expire_delay column exists before adding the column. 2015-07-23 11:06:57 +03:00
Hannes RosenöggerandValery Sizov b132127f5c revert caching of note text 2015-07-23 11:05:32 +03:00
Valery Sizov 94a9442722 update changelog 2015-07-23 11:04:50 +03:00
Jacob VosmaerandValery Sizov c3fd31c3b7 You need to store your DB encryption key 2015-07-23 11:03:56 +03:00
Valery Sizov 29861f24a6 revert cache issue 2015-07-23 11:02:17 +03:00
Valery Sizov 7d8636bd4d Version 7.13.0 v7.13.0 2015-07-22 11:40:32 +03:00
Valery Sizov a410a1651f Version 7.13.0.rc4 v7.13.0.rc4 2015-07-21 16:22:07 +03:00
Valery Sizov f474f5d48f Merge branch 'ce_stabe_updates' into '7-13-stable' 
Updates for 7.13 stable (RC4)



See merge request !1012
 2015-07-21 11:01:13 +00:00
Valery Sizov e8a6495b66 Revert "Update noteable after a new note is added" 
This reverts commit fbdaf0e2a5.
 2015-07-21 13:30:47 +03:00
Jacob VosmaerandValery Sizov ab94ed089a Don't stop if database.sql.gz already exists 
The existing behavior of the backups is to overwrite whatever data
was still there in the scratch directories. This broke when we added
a 'gzip' step because 'gzip database.sql' will fail if 'database.sql.gz'
already exists. Doing 'rm -f database.sql.gz' before the 'gzip'
avoids this failure.
 2015-07-21 13:22:40 +03:00
Dmitriy ZaporozhetsandValery Sizov 6f3c99e4d5 Document should start from h1 title. Also put badges on top for easier tracking 2015-07-21 13:19:09 +03:00
Valery Sizov c6dea4f4c0 Public project activity page asks for sign-in 2015-07-21 13:17:44 +03:00
Stan HuandValery Sizov e2b1adf628 Remove redundant last push event if activity feed is set to main page 
Closes #2009
 2015-07-21 13:16:44 +03:00
Robert SpeicherandValery Sizov 44f658012d Dynamically check :admin_* ability in issuable context 
Closes #2001
 2015-07-21 13:15:38 +03:00
Valery Sizov 3387c4bde8 update changelog 2015-07-21 13:13:04 +03:00
Stan HuandValery Sizov 77363724b2 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-21 13:12:01 +03:00
Valery Sizov 008d1381ce Revert "Revert "Merge branch 'cache-improvement' into '7-13-stable' 
This reverts commit ebb6393d0e.
 2015-07-21 13:07:39 +03:00
Valery Sizov 37037b70b8 Version 7.13.0.rc3 v7.13.0.rc3 2015-07-20 00:31:14 +03:00
Valery Sizov d0fb82c193 Merge branch 'update_for_stable' into '7-13-stable' 
Fixes from master to 7.13.rc3



See merge request !1001
 2015-07-19 20:11:03 +00:00
Valery Sizov ebb6393d0e Revert "Merge branch 'cache-improvement' into '7-13-stable' " 
This reverts commit 94c2516afc, reversing
changes made to ae44e5ec06.
 2015-07-19 22:49:21 +03:00
Stan HuandValery Sizov 55b4f31d92 Fix bug where notes were being rendered with wrong color preferences due to caching 
Closes #2008
 2015-07-19 22:37:11 +03:00