summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix project lookup for git over http + rails4Dmitriy Zaporozhets2013-12-101-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Added allow_blank to model validationsDmitriy Zaporozhets2013-12-103-3/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use gems that works with rails 4Dmitriy Zaporozhets2013-12-102-26/+30
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update config/* to rails4Dmitriy Zaporozhets2013-12-103-7/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use real gemsDmitriy Zaporozhets2013-12-102-19/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Migrate application to rails 4 step 1Dmitriy Zaporozhets2013-12-105-8/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Rails 4 and other gems updateDmitriy Zaporozhets2013-12-102-222/+256
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-12-104-11/+10
|\
| * Merge pull request #5779 from jvanbaarsen/patch-1Dmitriy Zaporozhets2013-12-101-1/+1
| |\ | | | | | | Better warning when deleting a user
| | * Better warning when deleting a userJeroen van Baarsen2013-12-061-1/+1
| | | | | | | | | | | | Warn the administrator better when deleting a user. Fixes: https://github.com/gitlabhq/gitlabhq/issues/4295
| * | Merge pull request #5781 from Rovanion/patch-5Dmitriy Zaporozhets2013-12-101-8/+2
| |\ \ | | | | | | | | Git clone now gets the right branch from the getgo
| | * | Git clone now gets the right branch from the getgoRovanion Luckey2013-12-061-8/+2
| | | | | | | | | | | | Simplified the instructions by two steps.
| * | | Merge pull request #5794 from maltefiala/masterDmitriy Zaporozhets2013-12-101-1/+6
| |\ \ \ | | | | | | | | | | Added Rake:Attack cp information to Upgrade Guide 6.3.0
| | * | | Added Rake:Attack cp information to Upgrade Guide 6.3.0maltefiala2013-12-081-1/+6
| | | | |
| * | | | Merge pull request #5798 from criteo/skip_confirmationDmitriy Zaporozhets2013-12-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | Skip email confirmation with LDAP
| | * | | | Skip email confirmation with LDAPMaxime Brugidou2013-12-091-1/+1
| | | | | |
* | | | | | Merge branch 'key-generation' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-101-6/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | The comments make it hard to copy paste commands. If you paste the whole ↵dosire2013-12-091-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | line it fails.
* | | | | | Merge branch 'installation-link' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-091-2/+4
|\ \ \ \ \ \
| * | | | | | Installation should be a paragraph since it is deep linked from everywhere.dosire2013-12-091-2/+4
| | | | | | |
* | | | | | | Merge branch 'feature/gitlab_shell_path' of ↵Dmitriy Zaporozhets2013-12-093-14/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | | | | Add gitlab-shell#path option in configDmitriy Zaporozhets2013-12-093-14/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit gitlab-shell but me placed directly in home dir. Ex: /home/git/gitlab-shell After this change you can place gitlab-shell in custom location. Ex: /Users/developer/gitlab/gitlab-shell Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Use antialiased font-smoothing for webkitDmitriy Zaporozhets2013-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'feature/api_version_admin' of ↵Dmitriy Zaporozhets2013-12-091-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | | | | Show GitLab API version on Admin#dashboardDmitriy Zaporozhets2013-12-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'bug/duplicates_in_search' of ↵Dmitriy Zaporozhets2013-12-091-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | /home/git/repositories/gitlab/gitlabhq
| * | | | | | | | Remove duplicate items from search autocompleteDmitriy Zaporozhets2013-12-091-1/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old behaviour gave you duplicate entries if your project is public Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'feature/no_reply' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-091-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Set noreply@HOSTNAME for reply_to field in all emailsDmitriy Zaporozhets2013-12-091-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge pull request #5548 from CromFr/masterSytse Sijbrandij2013-12-093-4/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed comments for running gitlab in a non-root path
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/gitlabhq/gitlabhqCrom (Thibaut CHARLES)2013-12-09302-1261/+4807
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/application.rb config/gitlab.yml.example config/unicorn.rb.example
| * | | | | | | Fixed comments for running gitlab in a non-root pathCrom (Thibaut CHARLES)2013-11-063-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If you don't edit gitlab-shell/config.yml, you wnon't be able to push via SSH (as described here: http://stackoverflow.com/questions/15746336/gitlab-cant-push-code-to-server) - If you don't re-run sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production, some icons won't be visible
* | | | | | | | Merge pull request #5483 from e1himself/patch-1Sytse Sijbrandij2013-12-091-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix Markdown help page: escape file link syntax example to leave it unprocessed
| * | | | | | | Fix Markdown help page: escape file link syntax example to leave it unprocessedIvan Voskoboynyk2013-10-301-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-12-092-1/+3
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #5471 from dex4er/feature_etc_default_gitlabJacob Vosmaer2013-12-091-0/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | Read configuration variable file (/etc/default/gitlab) if it is present
| | * | | | | | Read configuration variable file if it is presentPiotr Roszatycki2013-10-291-0/+2
| | |/ / / / /
| * | | | | | Merge pull request #5791 from mmoll/typoSytse Sijbrandij2013-12-071-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | fix typo: enthousiast -> enthusiast
| | * | | | | fix typo: enthousiast -> enthusiastMichael Moll2013-12-071-1/+1
| |/ / / / /
* | | | | | Merge branch 'users_group_observer' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-092-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Avoid duplicate group membership emailsJacob Vosmaer2013-12-092-1/+6
|/ / / / /
* | | | | Merge branch 'add-book' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-071-4/+8
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Mention enterprise edition and the book, also some cleanup.dosire2013-12-071-4/+8
|/ / / /
* | | | Show rails version in admin areaDmitriy Zaporozhets2013-12-061-0/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Remove colors from icon helpersDmitriy Zaporozhets2013-12-062-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'update-patch-guide' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-061-5/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make everygreen.dosire2013-12-061-5/+9
| | | |
| * | | Update universal guide.dosire2013-12-061-1/+1
| | | |
* | | | Merge branch 'feature/api_cors' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-063-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Allow Cross-origin resource sharing for GitLab APIDmitriy Zaporozhets2013-12-053-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It will allow to write web applications on other domains to interact with GitLab instances Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status