summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add group avatar to group page. Changed default avatar for groupDmitriy Zaporozhets2014-01-283-4/+8
* Merge pull request #6178 from Popl7/add_group_avatarsDmitriy Zaporozhets2014-01-288-1/+71
|\
| * added group avatarsSteven Thonus2014-01-288-1/+71
* | Merge branch 'highlight-js' into 'master'Dmitriy Zaporozhets2014-01-2818-366/+715
|\ \ | |/ |/|
| * Improve highlight for notesDmitriy Zaporozhets2014-01-275-10/+9
| * Fix blob multiline highlightDmitriy Zaporozhets2014-01-278-8/+32
| * Add highlight.js support to markdown, snippets etcDmitriy Zaporozhets2014-01-278-79/+84
| * Improve themes. Load highlight.js properlyDmitriy Zaporozhets2014-01-267-152/+487
| * Init highlgiht js and render for blob. Improve css for itDmitriy Zaporozhets2014-01-263-27/+25
| * Modify white and solarized themes for hljsDmitriy Zaporozhets2014-01-262-134/+120
| * Include highlight.js assetsDmitriy Zaporozhets2014-01-262-0/+2
* | Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ceDmitriy Zaporozhets2014-01-271-2/+0
|\ \
| * | Add files to path blacklist.Jason Hollingsworth2014-01-241-2/+0
| |/
* | Merge branch 'fix/test' of /mnt/ebs/repositories/jhworth.developer/gitlab-ceDmitriy Zaporozhets2014-01-271-1/+1
|\ \
| * | Fix broken test in spec/models/project_spec.rbJason Hollingsworth2014-01-241-1/+1
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-01-271-1/+1
|\ \
| * \ Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ceSytse Sijbrandij2014-01-261-1/+1
| |\ \ | | |/ | |/|
| | * Removed hash from "<user> #pushed to branch..." Hipchat notificationJeppe Toustrup2014-01-141-1/+1
* | | Merge pull request #6158 from Razer6/remove_snippet_expiaration_dateDmitriy Zaporozhets2014-01-261-7/+0
|\ \ \
| * | | Remove snippet expiration date from UIRobert Schilling2014-01-251-7/+0
| |/ /
* | | Merge pull request #6159 from dblessing/fix/mobile_ui_dashboardDmitriy Zaporozhets2014-01-2619-17/+124
|\ \ \
| * | | Mobile UI improvements for dashboard/navDrew Blessing2014-01-2519-17/+124
| |/ /
* | | Merge pull request #5476 from lyda/logo-white-compressDmitriy Zaporozhets2014-01-2618-0/+0
|\ \ \ | |/ / |/| |
| * | Also optimise gifs with gifsicle.Kevin Lyda2014-01-056-0/+0
| * | Another optipng run over png's.Kevin Lyda2014-01-052-0/+0
| * | Merge branch 'master' into logo-white-compressKevin Lyda2014-01-05375-3222/+5378
| |\ \
| * | | Reduce image size.Kevin Lyda2013-10-2912-0/+0
* | | | Merge branch 'reference_relative_links' into 'master'Dmitriy Zaporozhets2014-01-241-6/+25
|\ \ \ \
| * \ \ \ Merge branch 'master' into reference_relative_linksMarin Jankovski2014-01-2435-187/+263
| |\ \ \ \
| * | | | | Display correct paths in markdown for reference style links.Marin Jankovski2014-01-221-6/+25
* | | | | | Improve authorization for new/edit blob pagesDmitriy Zaporozhets2014-01-244-1/+4
* | | | | | Allow developers to mange issue trackerDmitriy Zaporozhets2014-01-243-1/+9
* | | | | | Fix mr update issue if merge_request_diff missingDmitriy Zaporozhets2014-01-241-1/+3
* | | | | | MergeRequests servicesDmitriy Zaporozhets2014-01-246-31/+90
| |/ / / / |/| | | |
* | | | | Merge branch 'ssh-docs' into 'master'Dmitriy Zaporozhets2014-01-241-2/+13
|\ \ \ \ \
| * | | | | Split into one sentence per line for future edits.dosire2014-01-231-3/+8
| * | | | | Better ssh key docs.dosire2014-01-231-2/+8
* | | | | | Project name was hardcoded (oops)Carlos Paramio2014-01-241-2/+5
* | | | | | Merge pull request #6131 from dblessing/fix/mobile_ui_loginDmitriy Zaporozhets2014-01-231-3/+2
|\ \ \ \ \ \
| * | | | | | Enhance responsive UI for the login screen.Drew Blessing2014-01-221-3/+2
* | | | | | | Merge branch 'improve/mr_diff'Dmitriy Zaporozhets2014-01-237-139/+194
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix MR spinach testsDmitriy Zaporozhets2014-01-231-1/+1
| * | | | | | Always create merge_request_diff if MR createdDmitriy Zaporozhets2014-01-223-2/+2
| * | | | | | Improve commit render performnace for MR show pageDmitriy Zaporozhets2014-01-224-19/+18
| * | | | | | Set mr_diff state to collected if diff is okDmitriy Zaporozhets2014-01-221-1/+4
| * | | | | | Render MR diff correctlyDmitriy Zaporozhets2014-01-222-4/+5
| * | | | | | Remove commits/diff store login from MergeRequest modelDmitriy Zaporozhets2014-01-222-114/+6
| * | | | | | MergeRequestDiff model responsoible for storing commits/diff infoDmitriy Zaporozhets2014-01-221-0/+160
| | |/ / / / | |/| | | |
* | | | | | Fix selectbox when submit MR from fork to originDmitriy Zaporozhets2014-01-232-2/+10
* | | | | | Fix HELP layoutDmitriy Zaporozhets2014-01-231-2/+2
| |/ / / / |/| | | |