summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'wiki-gfm-autocomplete' into 'master' Jacob Schatz2016-07-201-5/+5
|\
| * Chnaged noteable class checkwiki-gfm-autocompletePhil Hughes2016-07-141-1/+1
| * Fixed GFM autocomplete not loading on wiki pagesPhil Hughes2016-07-071-5/+5
* | Merge branch '19937-fix-wrong-build-elapsed-time' into 'master' Kamil Trzciński2016-07-193-15/+15
|\ \
| * | Fix build duration when build is not finished yet19937-fix-wrong-build-elapsed-timeRémy Coutable2016-07-183-15/+15
* | | Merge branch 'rs-issue-19878' into 'master' Douwe Maan2016-07-191-1/+1
|\ \ \
| * | | Ensure Owners are included in the scope for authorized_projectsRobert Speicher2016-07-191-1/+1
* | | | Merge branch '19847-running-icon' into 'master' Jacob Schatz2016-07-1913-8/+139
|\ \ \ \
| * | | | Fix alignment of icons on project page19847-running-iconAnnabel Dunstone2016-07-191-0/+5
| * | | | Vertically align status icon within tableAnnabel Dunstone2016-07-191-0/+1
| * | | | Add new icons for every CI statusAnnabel Dunstone2016-07-198-28/+42
| * | | | Add global style for running iconAnnabel Dunstone2016-07-195-27/+25
| * | | | Align running icon in merge requestAnnabel Dunstone2016-07-191-0/+10
| * | | | Add new running icon; add a bunch of styles to get svg to match existing fa i...Annabel Dunstone2016-07-1911-3/+106
* | | | | Merge branch 'clipboard-button' into 'master' Jacob Schatz2016-07-192-1/+6
|\ \ \ \ \
| * | | | | Remove white background on clipboard button; position iconclipboard-buttonAnnabel Dunstone2016-07-182-1/+6
* | | | | | Merge branch 'tag-page-updates' into 'master' Jacob Schatz2016-07-192-32/+42
|\ \ \ \ \ \
| * | | | | | Fix styling of tag pagetag-page-updatesAnnabel Dunstone2016-07-182-32/+42
| |/ / / / /
* | | | | | Merge branch 'fork-icon' into 'master' Jacob Schatz2016-07-195-4/+34
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add svg icon color to btn-color mixinfork-iconAnnabel Dunstone2016-07-153-10/+19
| * | | | | Add new fork svg iconAnnabel Dunstone2016-07-153-2/+23
* | | | | | Merge branch 'rename-repo-files' into 'master' Douwe Maan2016-07-196-3/+44
|\ \ \ \ \ \
| * | | | | | fixes an issue cause by a bad mergetiagonbotelho2016-07-191-1/+2
| * | | | | | Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-1945-1388/+1562
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-18111-519/+751
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | renames :file_name to :file_pathtiagonbotelho2016-07-132-4/+4
| * | | | | | | fixes frontend bugtiagonbotelho2016-07-121-1/+1
| * | | | | | | Merge branch 'rename-repo-files' of gitlab.com:tiagonbotelho/gitlab-ce into r...tiagonbotelho2016-07-121-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | test for nil params :file_nametiagonbotelho2016-07-121-1/+1
| | * | | | | | | refactors update action to change commit_params with the correct pathtiagonbotelho2016-07-122-5/+5
| | * | | | | | | changes the usasge of path to file_path on blob_controller for compatibillity...tiagonbotelho2016-07-113-6/+6
| | * | | | | | | Merge branch 'rename-repo-files' of gitlab.com:tiagonbotelho/gitlab-ce into r...tiagonbotelho2016-07-081-0/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | fixes more issues for MR acceptancetiagonbotelho2016-07-063-16/+17
| | | * | | | | | | fixes merge request edit bug where it would generate a cloned file and not re...tiagonbotelho2016-07-061-5/+5
| | | * | | | | | | fixes issues for mr acceptancetiagonbotelho2016-07-062-6/+4
| | | * | | | | | | refactors to pass values as arguments through optionstiagonbotelho2016-07-062-14/+17
| | | * | | | | | | removes debugging prints from codetiagonbotelho2016-07-062-24/+0
| | | * | | | | | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-061-0/+16
| | | * | | | | | | remove prints and useless commentstiagonbotelho2016-07-061-2/+0
| | | * | | | | | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-061-0/+2
| | | * | | | | | | refactors blob_controllertiagonbotelho2016-07-062-11/+16
| | | * | | | | | | remove prints and useless commentstiagonbotelho2016-07-061-2/+0
| | | * | | | | | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-061-0/+2
| | | * | | | | | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-061-1/+0
| | | * | | | | | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-064-2/+34
| | | * | | | | | | remove prints and useless commentstiagonbotelho2016-07-061-2/+0
| | | * | | | | | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-061-0/+2
| | | * | | | | | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-061-2/+2
| | | * | | | | | | remove prints and useless commentstiagonbotelho2016-07-062-3/+1
| | | * | | | | | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-063-2/+9