summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Display https as repo clone indicator and prevent modification of ↵Marin Jankovski2012-10-212-2/+2
| | | | | | | | web_protocol variable. Rewrite build_url, use web_protocol for repo indicator. Explicitly initialize custom port to make the logic obvious.
* Merge pull request #1717 from riyad/add-author-to-tree-listingDmitriy Zaporozhets2012-10-216-16/+48
|\ | | | | Update author info in tree listing
| * 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? ↵randx2012-10-216-3/+29
| | | | | | | | method usage
* | Fix bug in MergeRequest#mark_as_unmergableRiyad Preukschas2012-10-201-1/+2
| |
* | Refactor Gitlab::MergeRiyad Preukschas2012-10-201-1/+1
|/ | | | | | * Refactor and document methods * Rename merge to merge! * Fixes #1544
* Merge pull request #1712 from riyad/use-gem-for-emojiDmitriy Zaporozhets2012-10-181-1/+1
|\ | | | | Use gem for Emoji
| * Fix use of EmojiRiyad Preukschas2012-10-181-1/+1
| |
* | Rename NoteObserver methods and clarify thingsRiyad Preukschas2012-10-181-8/+13
| |
* | Reorder and group methods in Notify mailerRiyad Preukschas2012-10-181-35/+66
|/
* Added project has_one :last_event assoc. Fixed tab line-height after ↵randx2012-10-173-7/+7
| | | | font-awesome. Increased projects per page on dashboard
* revert all wiki changesValeriy Sizov2012-10-174-22/+18
|
* Wiki style: move styles to right placeValeriy Sizov2012-10-172-16/+12
|
* Wiki Style FixingValeriy Sizov2012-10-173-4/+12
|
* Merge pull request #1715 from riyad/use-font-awesomeValeriy Sizov2012-10-171-0/+1
|\ | | | | Use Font Awsome for icons
| * Import Font Awesome stylesRiyad Preukschas2012-10-161-0/+1
| |
* | 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 issue close and reopen button text and styles
| * | 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
|/
* 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-1513-79/+76
|\ | | | | Refactor tree views and improve consistency
| * Make history link for trees look like action links for blobsRiyad Preukschas2012-10-164-5/+9
| |
| * Remove #history_path and #mb_size from TreeDecoratorRiyad Preukschas2012-10-151-13/+0
| |
| * Fix offered links in tree/blob_actions partialRiyad Preukschas2012-10-151-2/+9
| |
| * Use tree/blob_actions partial for blame view and fix file name encodingRiyad Preukschas2012-10-151-7/+4
| |
| * Display more accurate file size in tree/blob/download partialRiyad Preukschas2012-10-151-1/+1
| |
| * Display file size instead of mode in tree/blob partialRiyad Preukschas2012-10-151-1/+1
| |
| * Extract out tree/blob/* partialsRiyad Preukschas2012-10-154-27/+28
| |
| * Extract tree/readme partialRiyad Preukschas2012-10-152-12/+13
| |
| * Extract tree/blob_actions partialRiyad Preukschas2012-10-152-6/+6
| |
| * Rename tree/tree_file partial to tree/blobRiyad Preukschas2012-10-152-13/+13
| |
* | Remove redundant branch labels from MR formRiyad Preukschas2012-10-161-9/+3
|/ | | | Fixes #1525
* Merge pull request #1692 from riyad/saner-note-methodsDmitriy Zaporozhets2012-10-155-15/+22
|\ | | | | Small Note code cleanup
| * Make Note methods sanerRiyad Preukschas2012-10-135-15/+22
| |
* | Merge branch 'web_editor'randx2012-10-159-4/+90
|\ \
| * | Minor improve to UI and code formatting of gitlab web editorrandx2012-10-155-11/+27
| | |
| * | WebEditor: commit message is required nowValeriy Sizov2012-10-121-1/+1
| | |
| * | WebEditor: base implementationValeriy Sizov2012-10-122-4/+15
| | |
| * | WebEditor: Check if save is possibleValeriy Sizov2012-10-121-3/+2
| | |
| * | WebEditor: sceletonValeriy Sizov2012-10-122-2/+10
| | |
| * | Design improvedDmitriy Zaporozhets2012-10-122-18/+21
| | |
| * | WebEditor: integrated editorValeriy Sizov2012-10-124-3/+33
| | |