summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Show MR accept info only if merge request is openv6.4.0.pre3Dmitriy Zaporozhets2013-12-131-4/+5
* Add authenticity_token: true to multipart formsDmitriy Zaporozhets2013-12-123-3/+3
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2013-12-121-0/+2
|\
| * Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-121-0/+2
| |\
| | * Reduce Fog expiration period to 17 yearsJacob Vosmaer2013-12-111-1/+1
| | * Expire fog links after 34 yearsJacob Vosmaer2013-12-111-0/+2
* | | Add support for relative url to GitLab.GfmAutoComplete.Emoji.assetBaseDmitriy Zaporozhets2013-12-121-1/+1
|/ /
* | Fix emojii autocompleteDmitriy Zaporozhets2013-12-121-1/+1
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-12-121-1/+0
|\ \
| * \ Merge pull request #5827 from Razer6/remove_rails4_travisDmitriy Zaporozhets2013-12-121-1/+0
| |\ \
| | * | Remove rails4 branch in travis configuration since this branch is already mergedRobert Schilling2013-12-121-1/+0
| |/ /
* | | Merge branch 'bug/mr_duplicate_iids' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-1212-26/+101
|\ \ \ | |/ / |/| |
| * | Fix testDmitriy Zaporozhets2013-12-121-1/+1
| * | Allow close of broken MRDmitriy Zaporozhets2013-12-123-2/+21
| * | Use MR#source_project_path method instead of merge_request.source_project.pat...Dmitriy Zaporozhets2013-12-125-5/+5
| * | Proper erro message for MR when fork removedDmitriy Zaporozhets2013-12-121-9/+15
| * | Add new methods to MR to check if source or target branch existsDmitriy Zaporozhets2013-12-122-5/+36
| * | Render valid message when MR source or target branch was removedDmitriy Zaporozhets2013-12-122-1/+16
| * | do not remove merge requests when fork project destroyedDmitriy Zaporozhets2013-12-121-3/+7
|/ /
* | Merge branch 'bug/at_disappear' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-112-3/+3
|\ \ | |/ |/|
| * Fix disappearing @ when mention userDmitriy Zaporozhets2013-12-112-3/+3
* | Merge branch 'improve/avatar_size' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-111-1/+1
|\ \ | |/ |/|
| * Dashboard avatars: No need to load 40px images if we render them in 24pxDmitriy Zaporozhets2013-12-111-1/+1
* | Add DELETE to api corsDmitriy Zaporozhets2013-12-111-1/+1
* | Merge pull request #5759 from bke-drewb/issue-5496Dmitriy Zaporozhets2013-12-114-0/+23
|\ \
| * | Expire event cache on avatar creation/removalDrew Blessing2013-12-114-0/+23
|/ /
* | Update deploy.sh script with assets commandsDmitriy Zaporozhets2013-12-111-4/+5
|/
* Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-1127-30/+30
|\
| * Merge pull request #5819 from jvanbaarsen/rails4Dmitriy Zaporozhets2013-12-1027-30/+30
| |\
| | * Fixed all the confirm: deprecation warningsJeroen van Baarsen2013-12-1027-30/+30
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-12-113-13/+38
|\ \
| * \ Merge pull request #5801 from Rovanion/default-docJacob Vosmaer2013-12-103-13/+38
| |\ \
| | * | installation.md - Fixed typoRovanion Luckey2013-12-101-1/+4
| | * | Fixed security issue.Rovanion Luckey2013-12-091-1/+1
| | * | Added example defaults file and appropriate documentation.Rovanion Luckey2013-12-093-14/+36
* | | | Merge branch 'rails4' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-1146-400/+435
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Virtus to version 1.0.1. Bye-bye backportsDmitriy Zaporozhets2013-12-101-5/+3
| * | Update jasmine gem to work with rails4Dmitriy Zaporozhets2013-12-105-67/+67
| * | fix observer specsDmitriy Zaporozhets2013-12-105-24/+17
| * | Add require for Files contextsDmitriy Zaporozhets2013-12-103-0/+6
| * | Even more data: confirmDmitriy Zaporozhets2013-12-101-2/+2
| * | More data: confirmDmitriy Zaporozhets2013-12-101-5/+5
| * | Fix project models specsDmitriy Zaporozhets2013-12-101-1/+1
| * | Fix markdown helper specDmitriy Zaporozhets2013-12-101-1/+1
| * | Fix signup for rails4Dmitriy Zaporozhets2013-12-101-0/+6
| * | Fix UserProject obserse specDmitriy Zaporozhets2013-12-102-8/+4
| * | Fix more confirm deprecationsDmitriy Zaporozhets2013-12-102-2/+2
| * | Fix User#by_username_or_id for postgresDmitriy Zaporozhets2013-12-101-1/+1
| * | Remove some deprecations and fir project helper specsDmitriy Zaporozhets2013-12-103-4/+4
| * | Fix wiki editingDmitriy Zaporozhets2013-12-101-3/+3
View Lorry Controller Status