summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-data-integrity-issue-with-repository-downloads-path' into '...Douwe Maan2016-07-213-11/+34
|\
| * Use find instead Ruby to remove files due to performance reasonsDouglas Barbosa Alexandre2016-07-211-13/+4
| * Add service to clean up repository archive cacheDouglas Barbosa Alexandre2016-07-213-11/+43
* | Reduce min width of pipeline tableAnnabel Dunstone2016-07-212-2/+11
* | Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-2124-240/+287
|\ \
| * | Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-2024-240/+287
* | | Merge branch 'ui-bug-fixes' into 'master' Robert Speicher2016-07-219-12/+46
|\ \ \
| * | | Fix sha icon positioning on safariui-bug-fixesAnnabel Dunstone2016-07-211-2/+2
| * | | Mobile view for commit statusAnnabel Dunstone2016-07-212-1/+10
| * | | Fix ci icons getting cut offAnnabel Dunstone2016-07-215-9/+9
| * | | Fix firefox rendering of SVGsAnnabel Dunstone2016-07-211-0/+1
| * | | Fix icons on commits page and builds pageAnnabel Dunstone2016-07-212-1/+9
| * | | Add new fork SVG to fix weird styling of other SVGsAnnabel Dunstone2016-07-211-1/+3
| * | | Bug fixesAnnabel Dunstone2016-07-213-5/+19
| | |/ | |/|
* | | Don't use `params[:id]` while building `markdown_preview_path`.20079-new-wiki-page-500Timothy Andrew2016-07-211-1/+1
|/ /
* | Merge branch '20055-build-duration-showing-too-many-digits' into 'master' Stan Hu2016-07-211-0/+1
|\ \
| * | Cast duration to integer in `TimeHelper#time_interval_in_words`Rémy Coutable2016-07-211-0/+1
* | | Merge branch '20061-emailsonpushworker-fails-on-new-branch-pushes' into 'mast...Rémy Coutable2016-07-211-2/+2
|\ \ \ | |/ / |/| |
| * | Fix emails on push for new and deleted branches20061-emailsonpushworker-fails-on-new-branch-pushesSean McGivern2016-07-211-2/+2
* | | Merge branch 'fix/new-project-import-tooltip' into 'master' Fatih Acet2016-07-211-12/+12
|\ \ \ | |/ / |/| |
| * | added spec, fixed wordingJames Lopez2016-07-201-3/+3
| * | fix JS - now tooltip and flash should showJames Lopez2016-07-201-9/+9
* | | Merge branch 'hide-project-name-in-project-activities' into 'master' Fatih Acet2016-07-217-20/+26
|\ \ \
| * | | Hide namespace and project name on project activity page (!5068)winniehell2016-07-147-20/+26
* | | | Merge branch 'add-preview-image-border' into 'master' Fatih Acet2016-07-213-29/+23
|\ \ \ \
| * | | | Add image border in Markdown preview (!5162)winniehell2016-07-213-29/+23
* | | | | Merge branch 'gl-dropdown-enter-key-fix' into 'master' Fatih Acet2016-07-211-1/+14
|\ \ \ \ \
| * | | | | Fixed issue where using arrow keys would require arrow key to be pressed twicegl-dropdown-enter-key-fixPhil Hughes2016-07-201-5/+2
| * | | | | Highlights first row when filtering in dropdownsPhil Hughes2016-07-201-0/+11
| * | | | | Fixed dropdown enter key when searchingPhil Hughes2016-07-201-0/+5
* | | | | | Merge branch '20067-wiki-not-visible-from-web' into 'master' Rémy Coutable2016-07-211-1/+1
|\ \ \ \ \ \
| * | | | | | Make Service.external_wikis return only active external wikisRémy Coutable2016-07-211-1/+1
* | | | | | | Merge branch 'artifacts-from-ref-and-build-name-api' into 'master' Rémy Coutable2016-07-214-3/+23
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into artifacts-from-ref-and-build-name-apiLin Jen-Shin2016-07-2179-390/+859
| |\ \ \ \ \ \
| * | | | | | | Workaround MySQL with INNER JOIN:Lin Jen-Shin2016-07-212-3/+12
| * | | | | | | It's not longer than 80 charsLin Jen-Shin2016-07-201-3/+1
| * | | | | | | Also exclude artifacts_file with empty string, feedback:Lin Jen-Shin2016-07-201-1/+3
| * | | | | | | Use one query. Feedback:Lin Jen-Shin2016-07-201-7/+2
| * | | | | | | Avoid mixing builds from different pipelines:Lin Jen-Shin2016-07-203-6/+8
| * | | | | | | Join on associationLin Jen-Shin2016-07-201-1/+1
| * | | | | | | We need INNER JOIN to get the right pipeline,Lin Jen-Shin2016-07-201-1/+1
| * | | | | | | Now we could use normal relation, feedback:Lin Jen-Shin2016-07-201-2/+1
| * | | | | | | Use default_branch rather than master, feedback:Lin Jen-Shin2016-07-202-2/+2
| * | | | | | | Only allow branches/tags, disallow SHA:Lin Jen-Shin2016-07-191-5/+2
| * | | | | | | Merge branch 'master' into artifacts-from-ref-and-build-name-apiLin Jen-Shin2016-07-1916-52/+160
| |\ \ \ \ \ \ \
| * | | | | | | | API for downloading latest successful build:Lin Jen-Shin2016-07-193-1/+19
* | | | | | | | | Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-215-19/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove VideoJS and clean the integrationRémy Coutable2016-07-206-13/+6
| * | | | | | | | | Remove duplication, useless rescue, and avoid using ActionViewRémy Coutable2016-07-191-13/+16
| * | | | | | | | | Get rid of `is_image` in FileUploaderRémy Coutable2016-07-191-1/+0
View Lorry Controller Status