root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
10,474 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

10474 Commits

Author SHA1 Message Date
Marin Jankovski 0723bf1afa Move group milestone processing from service to model. 2014-06-30 09:44:30 +02:00
Marin Jankovski 8e8c074205 Reuse existing milestones counting. 2014-06-30 09:44:30 +02:00
Marin Jankovski 58570880f0 Create group milestones service. 2014-06-30 09:44:30 +02:00
Marin Jankovski e1afea777a Show title of milestone. 2014-06-30 09:44:30 +02:00
Marin Jankovski aaba993352 Skeleton of the group milestone index page. 2014-06-30 09:44:30 +02:00
Marin Jankovski ca6fd8841e Add group milestones routes and controller. 2014-06-30 09:42:28 +02:00
Dmitriy Zaporozhets 76e36dd253 Merge branch 'regression-tweet-links-to-issue' into 'master' 
Regression tweet links to issue

/cc @job @marin @jacobvosmaer
 2014-06-27 18:11:19 +00:00
Sytse Sijbrandij 32c96d5297 Merge branch 'add-image-to-backup-task' into 'master' 
Add image to backup task
 2014-06-27 13:02:51 +00:00
Sytse Sijbrandij 74039eb083 Add banner image to backup task. 2014-06-27 15:02:07 +02:00
Sytse Sijbrandij 379ffbb262 Link to regression issue from the tweet. 2014-06-27 10:46:52 +02:00
Dmitriy Zaporozhets 7a7c01b92a Merge branch 'lock_warning' into 'master' 
Rename MergeRequest#lock! to #lock_mr!
 2014-06-26 15:14:17 +00:00
Jacob Vosmaer b5007c1565 Rename MergeRequest#lock! to #lock_mr! 
As a warning from the StateMachine gem points out to us, there already
exists a method ActiveRecord#lock!. This change renames the `lock` and
`unlock` events defined on MergeRequest to `lock_mr` and `unlock_mr`.
 2014-06-26 14:09:17 +02:00
Dmitriy Zaporozhets 024e0577c6
Add html meta tag with software description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 12:56:15 +03:00
Dmitriy Zaporozhets 7abd1fd64f Merge branch 'small-changes' into 'master' 
Small changes
 2014-06-26 09:17:33 +00:00
Dmitriy Zaporozhets 548209c597 Merge branch 'rename-home-tabs' into 'master' 
Rename home tabs

* Dashboard Home -> Activity
* Project Home -> Activity
* Group Home -> Activity
* Profile Home -> Profile
* Admin Home -> Dashboard

Related to #1351
 2014-06-26 09:16:55 +00:00
Dmitriy Zaporozhets 1e3c9eb450
Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 12:05:06 +03:00
Dmitriy Zaporozhets 3a4b6b3930
Better name for admin home page. Move groups tab after users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 12:03:32 +03:00
Dmitriy Zaporozhets 439c0c3886 Merge branch 'commit-log-25' into 'master' 
Commit log 25

Related to #1381
 2014-06-26 09:01:55 +00:00
Dmitriy Zaporozhets fdb0d19763 Merge branch 'improve-markdwon-render' into 'master' 
Improve markdwon parsing

Fix 500 error when try to use relative links in project issues if repository is empty
 2014-06-26 08:05:00 +00:00
Sytse Sijbrandij b80e98f47a Small fixes to the requirements doc. 2014-06-26 09:55:08 +02:00
Sytse Sijbrandij a34dabd85c Simplify the supported/unsupported sections of the requirements guide. 2014-06-26 09:49:00 +02:00
Sytse Sijbrandij 340ed1dd2e Change newlines in requirements doc. 2014-06-26 09:42:43 +02:00
Dmitriy Zaporozhets ba7b4630a2
Replace home icon with tab names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:39:35 +03:00
Dmitriy Zaporozhets 3900eee30e
Increase commit log amount for tree view from 10 to 25 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:29:39 +03:00
Dmitriy Zaporozhets 3f8e6cf3d1 Merge branch 'dash-between-description-and-readme-link' into 'master' 
Dash between description and readme link
 2014-06-26 07:19:01 +00:00
Dmitriy Zaporozhets d66496050a Merge branch 'remove_group_filter' into 'master' 
Remove unused group filter
 2014-06-26 07:18:37 +00:00
Dmitriy Zaporozhets 1e673c72a1
Improve markdown parsing 
* dont try to build links for anchors like `#title-anchor`
* dont build relative url for project with empty repo

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:13:38 +03:00
Dmitriy Zaporozhets 654e840753 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-06-26 00:02:22 +03:00
Dmitriy Zaporozhets 1e313dcf11 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-26 00:01:32 +03:00
Dmitriy Zaporozhets 7e3e4c4116 Merge pull request #7190 from Nighoo/gravatar_profile_avatar 
do not advertise gravatar in profile if disabled
 2014-06-26 00:00:35 +03:00
Sytse Sijbrandij adf7dd36a9 Merge branch 'doc/groups' into 'master' 
Document the basics of working with Groups
 2014-06-25 13:29:11 +00:00
Jacob Vosmaer 4d77d4e12e Fix broken image link 2014-06-25 15:25:02 +02:00
Jacob Vosmaer 9549be5fe7 Document the basics of working with Groups 2014-06-25 15:23:10 +02:00
Sytse Sijbrandij fb3104dabf Merge pull request #7197 from jbrooksuk/patch-1 
Fix the PullReview tool link
 2014-06-25 13:08:10 +02:00
Sytse Sijbrandij 9ab3882510 Put a dash before the readme link so it doesn't look like it is part of the description. 2014-06-25 13:02:14 +02:00
James Brooks 401f958e6b Fix the PullReview tool link 2014-06-25 11:57:25 +01:00
Sytse Sijbrandij 6860390413 Merge branch 'small-contributions-no-rebase' into 'master' 
Small contributions no rebase

Based on https://github.com/gitlabhq/gitlabhq/pull/7067#issuecomment-45060241

/cc @dzaporozhets
 2014-06-25 10:57:10 +00:00
Dmitriy Zaporozhets 4d482b3b0c Merge branch 'version-file' into 'master' 
Version file

Fixes #1345
 2014-06-25 10:35:42 +00:00
Marin Jankovski d45b627abf Remove unused group filter 2014-06-25 12:31:34 +02:00
Sytse Sijbrandij 10a33f0f38 Merge branch 'remove-ruby-update-guide' into 'master' 
Remove ruby update guide

#1371
 2014-06-25 09:49:07 +00:00
Job van der Voort 086ec40184 remove ruby upgrade guide 2014-06-25 11:45:19 +02:00
Sytse Sijbrandij 4116588f65 Merge branch 'ruby-update-in-guide' into 'master' 
Ruby update in guide

Fixes #1371
 2014-06-25 09:41:33 +00:00
Job van der Voort 313e496665 update ruby in update guide 
textual changes
 2014-06-25 11:27:19 +02:00
Dmitriy Zaporozhets af7e77984c
Show VERSION information on project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 12:07:06 +03:00
Dmitriy Zaporozhets 79ee94eccb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-25 11:41:35 +03:00
Dmitriy Zaporozhets 674cbe1534
Fix diff comments toggle button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 11:40:33 +03:00
Sytse Sijbrandij 14f7646a87 Merge pull request #7195 from cirosantilli/patch-1 
Typo.
 2014-06-25 09:26:18 +02:00
Dmitriy Zaporozhets 907548a0fb
dont render discussion diff unless note is for diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 10:14:35 +03:00
Ciro Santilli 8e7a5cda30 Typo. 2014-06-25 09:06:39 +02:00
Dmitriy Zaporozhets f91f230cec
7.1.0 started 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:57:11 +03:00