summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* no raw data renderingDmitriy Zaporozhets2014-01-281-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add group avatar to group page. Changed default avatar for groupDmitriy Zaporozhets2014-01-283-4/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #6178 from Popl7/add_group_avatarsDmitriy Zaporozhets2014-01-288-1/+71
|\ | | | | added group avatars
| * added group avatarsSteven Thonus2014-01-288-1/+71
| |
* | Merge branch 'highlight-js' into 'master'Dmitriy Zaporozhets2014-01-2818-366/+715
|\ \ | |/ |/| | | | | | | | | | | Highlight.Js Replace pygments code highlight with client-side library - highlight.js http://highlightjs.org/
| * Improve highlight for notesDmitriy Zaporozhets2014-01-275-10/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix blob multiline highlightDmitriy Zaporozhets2014-01-278-8/+32
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add highlight.js support to markdown, snippets etcDmitriy Zaporozhets2014-01-278-79/+84
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve themes. Load highlight.js properlyDmitriy Zaporozhets2014-01-267-152/+487
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Init highlgiht js and render for blob. Improve css for itDmitriy Zaporozhets2014-01-263-27/+25
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Modify white and solarized themes for hljsDmitriy Zaporozhets2014-01-262-134/+120
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Include highlight.js assetsDmitriy Zaporozhets2014-01-262-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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
| |/ | | | | | | Remove empty ErrorsController
* | 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
| |/ | | | | | | | | | | A test was broken if running on a non-standard port. Made checking for (non-)standard port more robust. Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
* | 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 UI
| * | | 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
| * | | Mobile UI improvements for dashboard/navDrew Blessing2014-01-2519-17/+124
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style navbar toggle button Style navbar toggle manually instead of with button classes Style navbar Modify color Turn off all tooltips for touch devices Style main nav Fix scrolling navbar collapse Style tweaks Minor tweaks Style no ssh key message
* | | Merge pull request #5476 from lyda/logo-white-compressDmitriy Zaporozhets2014-01-2618-0/+0
|\ \ \ | |/ / |/| | Reduce image size.
| * | Also optimise gifs with gifsicle.Kevin Lyda2014-01-056-0/+0
| | | | | | | | | | | | | | | These are the same gif files just after running gifsicle -b --optimize **/*.gif
| * | Another optipng run over png's.Kevin Lyda2014-01-052-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ran optipng -o7 -fix over all png files. This should make pages load a tiny bit faster (you can test this with the pagespeed tool on firefox or chrome). It might be an idea to add *lossless* image compression optimization runs to the release process.
| * | Merge branch 'master' into logo-white-compressKevin Lyda2014-01-05375-3222/+5378
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: app/assets/images/logo-black.png app/assets/images/logo-white.png
| * | | Reduce image size.Kevin Lyda2013-10-2912-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking the site with the PageSpeed extension, one of the reports was in reducing image size. This reduced the number of bytes by 67%. It was done with optipng -o7 -fix *.png in the app/assets/images dir. References: optipng: http://optipng.sourceforge.net/ PageSpeed extension: https://developers.google.com/speed/docs/insights/using_chrome
* | | | Merge branch 'reference_relative_links' into 'master'Dmitriy Zaporozhets2014-01-241-6/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference style links with relative links in markdown #996 ``` Adds relative links support to reference style links, eg: [GitLab API doc directory][GitLab API directory listing] [Maintenance][Maintenance rake task] \[GitLab API directory listing]: doc/api/ \[Maintenance rake task]: doc/raketasks/maintenance.md ```
| * \ \ \ Merge branch 'master' into reference_relative_linksMarin Jankovski2014-01-2435-187/+263
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: spec/models/project_spec.rb
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Allow developers to mange issue trackerDmitriy Zaporozhets2014-01-243-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Fix mr update issue if merge_request_diff missingDmitriy Zaporozhets2014-01-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | MergeRequests servicesDmitriy Zaporozhets2014-01-246-31/+90
| |/ / / / |/| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'ssh-docs' into 'master'Dmitriy Zaporozhets2014-01-241-2/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Ssh Docs
| * | | | | 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.
| * | | | | | Enhance responsive UI for the login screen.Drew Blessing2014-01-221-3/+2
| | | | | | |
* | | | | | | Merge branch 'improve/mr_diff'Dmitriy Zaporozhets2014-01-237-139/+194
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/project_fork.rb features/steps/project/project_forked_merge_requests.rb features/steps/project/project_issue_tracker.rb features/steps/project/project_markdown_render.rb features/steps/shared/project.rb
| * | | | | | Fix MR spinach testsDmitriy Zaporozhets2014-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Always create merge_request_diff if MR createdDmitriy Zaporozhets2014-01-223-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Improve commit render performnace for MR show pageDmitriy Zaporozhets2014-01-224-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Set mr_diff state to collected if diff is okDmitriy Zaporozhets2014-01-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Render MR diff correctlyDmitriy Zaporozhets2014-01-222-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Remove commits/diff store login from MergeRequest modelDmitriy Zaporozhets2014-01-222-114/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | MergeRequestDiff model responsoible for storing commits/diff infoDmitriy Zaporozhets2014-01-221-0/+160
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Fix selectbox when submit MR from fork to originDmitriy Zaporozhets2014-01-232-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status