summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-12-162-10/+12
|\
| * Merge pull request #5645 from sajanp/enhancement/install-guideJacob Vosmaer2013-12-161-10/+11
| |\
| | * Reorder steps to install web server before running gitlab:checkSajan Parikh2013-11-211-10/+11
| * | Merge pull request #5617 from zeeZ/nginx-proxyDmitriy Zaporozhets2013-12-161-0/+1
| |\ \
| | * | Add X-Forwarded-For to nginx configzeeZ2013-11-181-0/+1
* | | | Fixed db schemaDmitriy Zaporozhets2013-12-161-180/+181
|/ / /
* | | Merge pull request #5849 from bke-drewb/feature/hide_no_ssh_key_messageDmitriy Zaporozhets2013-12-163-4/+12
|\ \ \
| * | | Allow user to hide the message to add an ssh key permanentlyDrew Blessing2013-12-143-4/+12
* | | | Merge pull request #5847 from skv-headless/fix_deprecation_warningsDmitriy Zaporozhets2013-12-1628-56/+57
|\ \ \ \
| * | | | fix most of warningsskv2013-12-1528-56/+57
* | | | | Merge pull request #5856 from nishigori/fix-typoDmitriy Zaporozhets2013-12-166-8/+8
|\ \ \ \ \
| * | | | | Fix messages typoTakuya Nishigori2013-12-166-8/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #5848 from bke-drewb/feature/time_ago_tooltipsDmitriy Zaporozhets2013-12-1623-53/+48
|\ \ \ \ \
| * | | | | Add time ago tooltips to show actual date/timeDrew Blessing2013-12-1423-53/+48
| |/ / / /
* | | | | Merge pull request #5681 from chopmann/patch-2Dmitriy Zaporozhets2013-12-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | FIX: Browser back button breaks "Loading..." visualCornelio Hopmann2013-11-241-1/+1
* | | | | Remove colored gem from upgrader script. pt2Dmitriy Zaporozhets2013-12-141-1/+1
* | | | | Remove colored gem from upgrader scriptDmitriy Zaporozhets2013-12-141-5/+4
| |/ / / |/| | |
* | | | Merge branch 'feature/minor_update_script' of /home/git/repositories/gitlab/g...Dmitriy Zaporozhets2013-12-133-0/+124
|\ \ \ \
| * | | | Use 'ruby script/upgrade.rb -y' instead of ENVDmitriy Zaporozhets2013-12-131-1/+1
| * | | | Allow non-interactive run of upgrade script. ruby script/upgrade.rb FORCE=yesDmitriy Zaporozhets2013-12-131-1/+5
| * | | | Create branch for tagDmitriy Zaporozhets2013-12-131-4/+1
| * | | | Minor version upgraderDmitriy Zaporozhets2013-12-133-0/+123
* | | | | Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-12-132-18/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix header caseDmitriy Zaporozhets2013-12-131-1/+1
| * | | | Fix broken UI for admin system hooksDmitriy Zaporozhets2013-12-131-17/+10
* | | | | 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