summaryrefslogtreecommitdiff
path: root/app/views/projects/commit
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade to Rails 4.1.9Vinnie Okada2015-02-142-8/+8
| | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* Commit page: async load branches infoValery Sizov2015-02-032-17/+22
| | | | | Conflicts: config/routes.rb
* Show branches/tags as labels on commit pageDmitriy Zaporozhets2015-01-221-16/+14
|
* Show tags in commit viewHannes Rosenögger2015-01-171-0/+7
|
* Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-101-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix fa-download iconSullivan SENECHAL2014-10-041-1/+1
|
* Upgrade to Font Awesome v4.2Sullivan SENECHAL2014-10-031-2/+2
|
* Use new diff parsing logicDmitriy Zaporozhets2014-09-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* whitespaceses at beginning of commit messagesskv2014-08-141-1/+1
|
* Refactor diff suppress logic and diff viewsDmitriy Zaporozhets2014-07-152-4/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix commit comment count cssDmitriy Zaporozhets2014-03-141-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor js behaviours helpersDmitriy Zaporozhets2014-03-111-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix btn margin for commit show pageDmitriy Zaporozhets2014-02-281-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use more specific class names: grouped -> btn-groupedDmitriy Zaporozhets2014-02-201-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Include tw bootstrap manually. Fix hide classDmitriy Zaporozhets2014-01-011-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* alert-error to alert-dangerDmitriy Zaporozhets2013-12-311-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* css class .hide has \!important so use gl-hide insteadDmitriy Zaporozhets2013-12-311-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove unnecessary ago keywordDmitriy Zaporozhets2013-12-301-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add time ago tooltips to show actual date/timeDrew Blessing2013-12-141-4/+2
| | | | | | | | | | | | | | | | | | Clean up admin dashboad tooltips Clean up admin dashboad tooltips Clean up admin dashboad tooltips Add helper method change to use app helper Modify tooltips to use new helper Convert remaining times Adjust one tooltip
* Prevent 500 error if cant detect branches for commitDmitriy Zaporozhets2013-10-231-11/+12
|
* Show branches list (which branches contains commit) on commit pageAndrey Kumanyaev2013-10-211-0/+12
|
* Improve Commit#show page UIDmitriy Zaporozhets2013-08-121-48/+45
|
* Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into ↵Dmitriy Zaporozhets2013-07-301-1/+1
|\ | | | | | | | | | | | | | | | | karlhungus-mr-on-fork Conflicts: app/views/projects/commit/show.html.haml app/views/projects/compare/show.html.haml app/views/projects/merge_requests/branch_from.js.haml
| * MR on Fork multiple fixesIzaak Alpert2013-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
* | squash commit summary in one sentenceDmitriy Zaporozhets2013-07-181-8/+0
|/
* Correct path to view for huge commits. Fix #3996Markevych Alexander2013-07-141-1/+1
|
* Replace page_title with page-title. Correct margin for some blocks/layoutsDmitriy Zaporozhets2013-07-131-1/+1
|
* Reduce top margin for commit show page boxDmitriy Zaporozhets2013-07-121-1/+1
|
* Move projects controllers/views in Projects moduleDmitriy Zaporozhets2013-06-233-0/+64
View Lorry Controller Status