Commit Graph
6897 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 024a37ce20 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-24 17:18:56 +03:00
Dmitriy Zaporozhets 0542261437 Allow git clone with http for GitLab CI service:
If you enable GitLab CI for project you will be able to clone project
source code with next command:
git clone http://gitlab-ci-token:XXXXXXXXXXXX@host:project.git
Requires for GitLab CI 4.0
2013-10-24 17:17:22 +03:00
Jacob Vosmaer d4cc9b187a Merge pull request #4986 from Machiel/patch-1
Added git command to change shell to 1.1.0 to make sure the check passes
2013-10-24 07:11:45 -07:00
Dmitriy Zaporozhets 71f92d4539 Merge pull request #5422 from fintler/patch-1
Non-logic wording and grammar for the new group view
2013-10-24 06:28:18 -07:00
Dmitriy Zaporozhets a542f80743 Merge pull request #5326 from Rovanion/init-fix
Made stop message make more sense, app_root now uses the user name.
2013-10-24 06:27:44 -07:00
Rovanion LuckeyandGitLab 67a80d07ab Updated the init script, now waits for pids 2013-10-24 14:56:17 +02:00
Dmitriy Zaporozhets 8387806604 Disable text shadow for ui-box 2013-10-24 15:46:54 +03:00
Dmitriy Zaporozhets c465636a7c Merge pull request #5428 from weisjohn/patch-2
Typo fixed
2013-10-24 00:08:42 -07:00
Dmitriy Zaporozhets 055f512b97 Merge pull request #4968 from pdf/issue_4831
Expand refs constraints to include valid characters
2013-10-24 00:08:01 -07:00
Peter Fern 05c988419f Expand refs constraints to include valid characters
Fixes #4831, #4865, #4932
2013-10-24 16:31:15 +11:00
John Weis 74790bd8d9 Typo fixed
"ssending" to "sending"
2013-10-23 16:53:06 -04:00
Dmitriy Zaporozhets 4ab27017e5 Merge pull request #5416 from Popl7/fix_max_size_avatar_upload_readme
fixed maximum avatar size in changelog
2013-10-23 09:40:02 -07:00
Dmitriy Zaporozhets 2b555306a1 Prevent 500 error if cant detect branches for commit 2013-10-23 19:29:29 +03:00
Jon Bringhurst eb44ab0086 Non-logic wording and grammar for the new group view 2013-10-23 09:33:29 -06:00
Steven Thonus 89f7b65e03 fixed maximum avatar size in changelog 2013-10-23 10:34:43 +02:00
Jacob Vosmaer c2f74de4c0 Merge pull request #5395 from dpursehouse/more-label-fixes
More label fixes
2013-10-23 00:58:53 -07:00
Dmitriy Zaporozhets 88519e9033 Refactor and restyle Admin#background_jobs page 2013-10-23 10:11:54 +03:00
Dmitriy Zaporozhets 9f31fbc983 Merge pull request #5340 from Undev/feature/branches_on_commit_page_pr
Show branches list (which branches contains commit) on commit page
2013-10-22 23:50:22 -07:00
Dmitriy Zaporozhets 76f8f4bcf8 Merge pull request #5346 from jojosch/sidekiq-running-procs-infopage-user
Print the configured GitLab user on the Admin-Sidekiq page
2013-10-22 23:47:29 -07:00
Dmitriy Zaporozhets d5b259417a Merge pull request #5345 from jojosch/sidekiq-running-procs-infopage
Show only processes owned by the GitLab user on the Admin-Sidekiq page
2013-10-22 23:47:12 -07:00
Dmitriy Zaporozhets 591421e89d Merge pull request #5393 from anthonyryan1/master
Remove text-shadow from code blocks for all themes
2013-10-22 23:40:48 -07:00
Dmitriy Zaporozhets 6d519a769c Merge pull request #5407 from inouire/master
Fix typo in sample smtp settings
2013-10-22 23:39:30 -07:00
Dmitriy Zaporozhets 0492964b3b Merge pull request #5410 from Popl7/fix_max_size_shown_avatar_upload_profile
set maximum filesize for avatar on profile page correct
2013-10-22 23:38:46 -07:00
Dmitriy Zaporozhets de46a5b602 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-23 09:35:06 +03:00
Dmitriy Zaporozhets 6683897a41 Merge branch 'bash_3_compatibility' of /home/git/repositories/gitlab/gitlabhq 2013-10-23 06:34:41 +00:00
David Pursehouse 03dec79c74 Fix some more instances of "Created at"
"Created on" should be used when the timestamp is only a date.
2013-10-23 10:15:08 +09:00
David Pursehouse c2084639df Improve warning message when removing account 2013-10-23 10:15:08 +09:00
David Pursehouse 618ba8ca47 Improve warning message when removing group 2013-10-23 10:15:08 +09:00
Steven Thonus 1c70bd2549 set maximum filesize for avatar on profile page correct 2013-10-22 20:15:01 +02:00
Edouard 4dbce77615 Fix typo in sample smtp settings 2013-10-22 17:38:11 +02:00
Jacob Vosmaer 3bef6b46f8 Use 2>&1 because Bash 3 does not support &>> 2013-10-22 10:27:23 +02:00
Jacob Vosmaer 5093cb02d6 Merge pull request #5392 from jvanbaarsen/patch-2
Typo fix in show.html.haml
2013-10-22 00:52:09 -07:00
Jacob Vosmaer 2c37904dc0 Merge pull request #5391 from jvanbaarsen/patch-1
Update 6.1-to-6.2.md
2013-10-22 00:50:32 -07:00
Anthony Ryan ebe49e6ac6 Ensure that highlighted code blocks never get a text-shadow regardless of where they are or what theme is used. 2013-10-21 18:29:36 -04:00
Andrey Kumanyaev 6173d0a92f Show branches list (which branches contains commit) on commit page 2013-10-21 22:54:37 +04:00
Jeroen van Baarsen 5014ecf6e4 Typo fix in show.html.haml
Personl -> Personal
2013-10-21 20:54:18 +02:00
Jeroen van Baarsen 193c8ab1a4 Update 6.1-to-6.2.md
Added a few enters so markdown can process the code (without adding bash in front of it)
2013-10-21 20:45:56 +02:00
Jacob Vosmaer 5717304098 Merge pull request #5359 from dpursehouse/update-some-labels
Minor grammatical updates in some of the labels.
2013-10-21 07:45:09 -07:00
Dmitriy Zaporozhets 85be902e08 Add tip to see difference between old and new config 2013-10-21 16:50:42 +03:00
Dmitriy Zaporozhets 3f66131b57 better align for project#home 2013-10-21 16:16:08 +03:00
Dmitriy Zaporozhets 396e484a0d Merge pull request #5385 from tsigo/notification-helper-spec
Add specs for NotificationsHelper
2013-10-21 05:37:46 -07:00
Dmitriy Zaporozhets 4a5a130a18 Merge branch 'improve/ui' of /home/git/repositories/gitlab/gitlabhq 2013-10-21 11:53:28 +00:00
Dmitriy Zaporozhets cf1416fad7 Show both Private and Public labels on project show page 2013-10-21 14:20:37 +03:00
Dmitriy Zaporozhets be7eb8e3c2 Fix test 2013-10-21 14:06:17 +03:00
Dmitriy Zaporozhets 0407eb2ee6 Render right clone panel partial on empty project page 2013-10-21 13:47:23 +03:00
Dmitriy Zaporozhets abda0560f1 Increase project home page margins 2013-10-21 13:41:32 +03:00
Dmitriy Zaporozhets 8ffbb51138 Make clone links looks related to clone bar 2013-10-21 13:26:17 +03:00
Dmitriy Zaporozhets 36a69b0a30 Update git-clone js. Use new style on wiki git access too 2013-10-21 13:07:16 +03:00
Dmitriy Zaporozhets 43dbd7986e Improve git clone panel 2013-10-21 13:06:26 +03:00
Dmitriy Zaporozhets 3dc0031fff New block buttons css 2013-10-21 13:05:52 +03:00