Commit Graph
10629 Commits
Author SHA1 Message Date
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
Jacob Vosmaer 4c61538b82 Add instructions to install Git from source
This is needed for Ubuntu 12.04, which only provides Git 1.7.9.
2013-10-21 14:23:59 +02: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
Dmitriy Zaporozhets 7999c2065e Redesign project home page 2013-10-21 13:05:20 +03:00
Dmitriy Zaporozhets e660da4f43 Separate partial for project home page dropdown 2013-10-21 13:04:06 +03:00
Dmitriy Zaporozhets 1a923fe02e Merge branch 'disable_rdoc' of /home/git/repositories/gitlab/gitlabhq v6.2.0 2013-10-21 08:04:33 +00:00
Dmitriy Zaporozhets 4aea30a6b5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-10-21 10:49:30 +03:00
Dmitriy Zaporozhets 6c5fa569d7 Reduce usage of bold font 2013-10-21 10:32:05 +03:00
Jacob Vosmaer af24fe915b Merge pull request #5380 from thestv/patch-1
corrected the url of the init-script
2013-10-21 00:22:45 -07:00
Dmitriy Zaporozhets 7210a34bc7 Version up to 6.2.0 2013-10-21 10:05:13 +03:00
Dmitriy Zaporozhets 92b3612025 Improve project_merge_requests.rb feature steps 2013-10-21 09:55:41 +03:00
Dmitriy Zaporozhets 584117aa87 Merge branch 'smtp_settings' of /home/git/repositories/gitlab/gitlabhq 2013-10-21 06:22:41 +00:00
Dmitriy Zaporozhets 5eadd14953 Merge pull request #5382 from nattster/patch-1
Use init.d/gitlab script from 6-0-stable branch
2013-10-20 22:48:14 -07:00
Robert Speicher ae4a20133f Add specs for NotificationsHelper 2013-10-20 23:58:38 -04:00
Natt Piyapramote e41f4a8480 Use init.d/gitlab script from 6-0-stable branch
Seems like init.d/gitlab script from master branch is not working anymore. Change to a version from 6-0-stable works fine.

It says:
```
Starting the GitLab Unicorn web server...
/etc/init.d/gitlab: 132: /etc/init.d/gitlab: script/web: not found
Starting the GitLab Sidekiq event dispatcher...
/etc/init.d/gitlab: 141: /etc/init.d/gitlab: script/background_jobs: not found
GitLab is not running.
```
2013-10-21 09:20:53 +07:00
Stefan Baust 511f666fc4 corrected the url of the init-script 2013-10-20 21:10:51 +02:00
Dmitriy Zaporozhets 9f7757ed24 Fix rspec test after bdd3513f03 2013-10-20 18:29:11 +03:00
Dmitriy Zaporozhets bdd3513f03 Merge pull request #5373 from rtripault/milestone-iid
Show milestones iid instead of id
2013-10-20 07:56:45 -07:00
Dmitriy Zaporozhets 131aff76e0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-10-20 17:55:49 +03:00
Dmitriy Zaporozhets e247a7c9eb Merge pull request #5377 from tsigo/autocomplete_refactor
Refactor search_autocomplete_source
2013-10-20 07:53:18 -07:00
Robert Speicher cb9cf077de Refactor and cover search_autocomplete_source 2013-10-20 01:05:20 -04:00
Robert Speicher bb494203d2 Cover the simple_sanitize helper 2013-10-19 23:57:34 -04:00
Romain 53564d9009 A few other iids instead of ids (mostly in edit forms) 2013-10-19 09:23:51 +02:00
Romain bae18f0a98 Show milestones iid instead of id 2013-10-19 09:08:54 +02:00
Jacob Vosmaer d4d1bce5ec Skip rdoc to speed up Ruby compilation 2013-10-18 18:04:58 +02:00
Jacob Vosmaer 898e2acd33 Merge pull request #5363 from Razer6/logrote_for_update_docs
Add logrotate config to update docs
2013-10-18 06:37:21 -07:00