summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Up to v3.0.0v3.0.0Dmitriy Zaporozhets2012-10-222-2/+14
* Log OutOfMemory exceptions from Merge Requests with GitLoggerrandx2012-10-211-0/+2
* Merge pull request #1740 from godric7/masterDmitriy Zaporozhets2012-10-211-0/+4
|\
| * enable Oauth login for existing regular usersGodric2012-10-201-0/+4
* | Merge pull request #1605 from dosire/repo_clone_indicatorDmitriy Zaporozhets2012-10-213-9/+11
|\ \
| * | Display https as repo clone indicator and prevent modification of web_protoco...Marin Jankovski2012-10-213-9/+11
|/ /
* | Merge pull request #1564 from dosire/cookie_secure_settingDmitriy Zaporozhets2012-10-211-1/+3
|\ \
| * | Secure and httponly options on cookie.Marin Jankovski2012-09-261-1/+3
* | | Merge pull request #1717 from riyad/add-author-to-tree-listingDmitriy Zaporozhets2012-10-216-16/+48
|\ \ \
| * | | Update author info in tree viewRiyad Preukschas2012-10-184-13/+23
| * | | Add CommitDecorator#author_linkRiyad Preukschas2012-10-181-0/+22
| * | | Fix wrong parameter order in Team#team_member_by_name_or_emailRiyad Preukschas2012-10-181-3/+3
| | |/ | |/|
* | | Security for online editor. Replace dev_access?, master_access? with can? met...randx2012-10-217-18/+56
* | | Merge pull request #1743 from riyad/fix-merging-bugsDmitriy Zaporozhets2012-10-212-34/+74
|\ \ \ | |/ / |/| |
| * | Fix bug in MergeRequest#mark_as_unmergableRiyad Preukschas2012-10-201-1/+2
| * | Refactor Gitlab::MergeRiyad Preukschas2012-10-202-33/+72
|/ /
* | add shared repository doc.Saito2012-10-181-0/+1
* | Merge pull request #1712 from riyad/use-gem-for-emojiDmitriy Zaporozhets2012-10-18852-6/+5
|\ \
| * | Fix use of EmojiRiyad Preukschas2012-10-182-2/+2
| * | Remove old Emoji code and imagesRiyad Preukschas2012-10-18848-4/+0
| * | Add gemoji gemRiyad Preukschas2012-10-182-0/+3
* | | Merge pull request #1695 from riyad/cleanup-note-observer-and-notificationsDmitriy Zaporozhets2012-10-183-62/+117
|\ \ \
| * | | Rename NoteObserver methods and clarify thingsRiyad Preukschas2012-10-182-27/+51
| * | | Reorder and group methods in Notify mailerRiyad Preukschas2012-10-181-35/+66
| |/ /
* | | Merge pull request #1727 from gitlabhq/fix_bug_wikiDmitriy Zaporozhets2012-10-181-1/+1
|\ \ \ | |/ / |/| |
| * | Fix 500 error when project is emptyValeriy Sizov2012-10-171-1/+1
|/ /
* | Fixing broken test of project last_activityrandx2012-10-171-16/+16
* | Added project has_one :last_event assoc. Fixed tab line-height after font-awe...randx2012-10-174-11/+10
* | v3.0.0pre. Updated gitlab_meta to 3.0. Extended changelograndx2012-10-174-4/+7
* | revert all wiki changesValeriy Sizov2012-10-174-22/+18
* | revertValeriy Sizov2012-10-171-2/+0
* | Wiki style: move styles to right placeValeriy Sizov2012-10-173-16/+14
* | Wiki Style FixingValeriy Sizov2012-10-173-4/+12
* | Merge pull request #1715 from riyad/use-font-awesomeValeriy Sizov2012-10-173-0/+6
|\ \
| * | Import Font Awesome stylesRiyad Preukschas2012-10-161-0/+1
| * | Add font-awesome-sass-rails gemRiyad Preukschas2012-10-162-0/+5
* | | Merge pull request #1719 from SaitoWu/features/sharedRepositoryValeriy Sizov2012-10-171-0/+3
|\ \ \
| * | | add shared repository supportSaito2012-10-171-0/+3
* | | | WebEditor: Cancel button. Confirm #1705Valeriy Sizov2012-10-171-2/+1
* | | | WebEditor: rename button save -> commit #1705Valeriy Sizov2012-10-171-1/+1
* | | | WebEditor: show branch #1705Valeriy Sizov2012-10-171-1/+1
* | | | Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttonsValeriy Sizov2012-10-163-3/+20
|\ \ \ \
| * | | | Fix issues close and reopen button text and stylesRiyad Preukschas2012-10-163-3/+20
| | |/ / | |/| |
* | | | WebEditor: fix unknown theme in production modeValeriy Sizov2012-10-162-2/+1
|/ / /
* | | Merge pull request #1704 from riyad/small-file-edit-fixesValeriy Sizov2012-10-161-2/+11
|\ \ \
| * | | Only allow editing text filesRiyad Preukschas2012-10-161-0/+9
| * | | Improve flash messages in tree#updateRiyad Preukschas2012-10-161-2/+2
|/ / /
* | | tree.readme method addedrandx2012-10-162-2/+6
* | | Fix plain text readmerandx2012-10-163-1/+16
* | | Merge pull request #1706 from riyad/refactor-tree-views-and-improve-consistencyDmitriy Zaporozhets2012-10-1515-82/+79
|\ \ \