summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-1215-15/+37
|\
| * Dontr decoarate already decorated stuffDmitriy Zaporozhets2014-10-101-1/+7
| * Use 8chars short sha for commit in viewsDmitriy Zaporozhets2014-10-104-4/+10
| * Dont raise exception when wrong commit id passedDmitriy Zaporozhets2014-10-101-0/+2
| * Use full commit sha width for reference in note body to prevent Ambiguous SHA...Dmitriy Zaporozhets2014-10-101-1/+1
| * Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-1011-11/+19
* | Merge pull request #7915 from bbodenmiller/patch-12Sytse Sijbrandij2014-10-121-3/+3
|\ \ | |/ |/|
| * improve wording on protected branches pageBen Bodenmiller2014-10-121-3/+3
* | Remove unused methodVinnie Okada2014-10-091-7/+0
* | annotateValery Sizov2014-10-0918-129/+175
* | Snippets: public/internal/privateValery Sizov2014-10-0911-48/+164
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-081-1/+2
|\ \
| * \ Merge pull request #7986 from liammonahan/masterDmitriy Zaporozhets2014-10-081-1/+2
| |\ \
| | * | Correctly pluralize participants on issue show page.Liam Monahan2014-10-081-1/+2
* | | | Remove border radius because it has wrong backgroundDmitriy Zaporozhets2014-10-081-2/+0
|/ / /
* | | Merge branch 'improve-danger-zone' into 'master'Dmitriy Zaporozhets2014-10-0810-111/+150
|\ \ \
| * | | Restyle colorful panel boxesDmitriy Zaporozhets2014-10-086-40/+33
| * | | Apply ConfirmDangerModal for project transfer/remove actionsDmitriy Zaporozhets2014-10-083-7/+22
| * | | ConfirmDangerModal window added. It will be used for confirmation of dangerou...Dmitriy Zaporozhets2014-10-082-0/+42
| * | | show danger settings by defaultDmitriy Zaporozhets2014-10-081-86/+75
* | | | Merge pull request #7545 from buildbox/buildbox-serviceDmitriy Zaporozhets2014-10-083-6/+131
|\ \ \ \ | |/ / / |/| | |
| * | | Handle the case where the CI service may not provide a status_img_path method.Keith Pitt2014-10-081-2/+7
| * | | Merge branch 'master' into buildbox-serviceKeith Pitt2014-10-08189-483/+882
| |\ \ \
| * | | | Added support for BuildboxKeith Pitt2014-10-083-7/+128
* | | | | Merge pull request #7983 from cirosantilli/factor-issue-mr-serviceDmitriy Zaporozhets2014-10-083-20/+15
|\ \ \ \ \
| * | | | | Factor issue and merge request servicesCiro Santilli2014-10-073-20/+15
* | | | | | Merge pull request #7938 from cirosantilli/factor-dashboard-helperDmitriy Zaporozhets2014-10-081-21/+12
|\ \ \ \ \ \
| * | | | | | Factor dashboard helper methods.Ciro Santilli2014-10-021-21/+12
* | | | | | | Merge pull request #7979 from mr-vinn/refactor-tasksDmitriy Zaporozhets2014-10-083-41/+34
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Rename coffeescript fileVinnie Okada2014-10-071-0/+0
| * | | | | | Refactor task list tests and coffeescriptVinnie Okada2014-10-063-41/+34
* | | | | | | Merge pull request #7981 from cirosantilli/www-to-aboutSytse Sijbrandij2014-10-083-4/+12
|\ \ \ \ \ \ \
| * | | | | | | Replace www.gitlab.com with about.gitlab.comCiro Santilli2014-10-073-4/+12
* | | | | | | | Merge pull request #7991 from cirosantilli/app-finders-readmeRobert Schilling2014-10-081-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve formatting of app/finders/README.mdCiro Santilli2014-10-071-4/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #7985 from cirosantilli/outdated-commentRobert Schilling2014-10-071-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Remove outdated comment from commits_controllerCiro Santilli2014-10-071-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'mr-widget-css' into 'master'Dmitriy Zaporozhets2014-10-074-17/+50
|\ \ \ \ \ \ \
| * | | | | | | Style merge request CI widget to match MR/Issue boxDmitriy Zaporozhets2014-10-074-17/+50
| | |/ / / / / | |/| | | | |
* | | | | | | Add a bit of space between star icon and textDmitriy Zaporozhets2014-10-071-2/+2
* | | | | | | Merge branch 't1254-snippets-refactoring' into 'master'Dmitriy Zaporozhets2014-10-074-10/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Snippets: rename public to internalValery Sizov2014-10-074-10/+10
| |/ / / / /
* | | | | | Merge pull request #7963 from cirosantilli/factor-previewableDmitriy Zaporozhets2014-10-072-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Factor markup? || gitlab_markdown? into new methodCiro Santilli2014-10-042-2/+2
* | | | | | Merge branch 'slack_integration' into 'master'Dmitriy Zaporozhets2014-10-062-12/+11
|\ \ \ \ \ \
| * | | | | | Add missing comma.Marin Jankovski2014-10-061-1/+1
| * | | | | | Accommodate new webhook url format.Marin Jankovski2014-10-061-5/+7
| * | | | | | Use only webhook for slack service integration.Marin Jankovski2014-10-062-10/+7
* | | | | | | Merge pull request #7964 from mr-vinn/task-listsMarin Jankovski2014-10-0615-7/+138
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Add task lists to issues and merge requestsVinnie Okada2014-10-0515-7/+138
| |/ / / / /
View Lorry Controller Status