summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-2127-1096/+340
|\
| * Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-2027-1096/+340
* | 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
* | | Merge branch 'bump-vmstat-version' into 'master' Stan Hu2016-07-212-3/+3
|\ \ \
| * | | Bump vmstat version to fix issues reporting on FreeBSDStan Hu2016-07-212-3/+3
* | | | Merge branch 'fix-has-external-wiki-migration' into 'master' Rémy Coutable2016-07-211-2/+3
|\ \ \ \
| * | | | Don't drop in DropAndReaddHasExternalWikiInProjectsfix-has-external-wiki-migrationYorick Peterse2016-07-211-2/+3
| |/ / /
* | | | Merge branch 'document-allow_failure-keyword' into 'master' Achilleas Pipinellis2016-07-211-23/+58
|\ \ \ \ | |/ / / |/| | |
| * | | Add allow_failure CI documentationdocument-allow_failure-keywordAchilleas Pipinellis2016-07-211-23/+58
* | | | Merge branch '20079-new-wiki-page-500' into 'master' Stan Hu2016-07-211-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Don't use `params[:id]` while building `markdown_preview_path`.20079-new-wiki-page-500Timothy Andrew2016-07-211-1/+1
* | | | Merge branch 'fix-migration-introduced-by-5387' into 'master' Stan Hu2016-07-212-13/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Fix migration to make it fastRémy Coutable2016-07-212-13/+14
| |/ /
* | | Fix CHANGELOGRémy Coutable2016-07-211-34/+35
* | | Merge branch '20055-build-duration-showing-too-many-digits' into 'master' Stan Hu2016-07-212-0/+2
|\ \ \
| * | | Cast duration to integer in `TimeHelper#time_interval_in_words`Rémy Coutable2016-07-212-0/+2
| |/ /
* | | Merge branch '20061-emailsonpushworker-fails-on-new-branch-pushes' into 'mast...Rémy Coutable2016-07-212-2/+38
|\ \ \ | |/ / |/| |
| * | Fix emails on push for new and deleted branches20061-emailsonpushworker-fails-on-new-branch-pushesSean McGivern2016-07-212-2/+38
* | | Merge branch 'fix/new-project-import-tooltip' into 'master' Fatih Acet2016-07-213-12/+28
|\ \ \ | |/ / |/| |
| * | fix spec - unused varfix/new-project-import-tooltipJames Lopez2016-07-201-1/+1
| * | fix specJames Lopez2016-07-201-1/+3
| * | added spec, fixed wordingJames Lopez2016-07-202-3/+16
| * | added changelogJames Lopez2016-07-201-0/+1
| * | 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-218-20/+27
|\ \ \
| * | | Hide namespace and project name on project activity page (!5068)winniehell2016-07-148-20/+27
* | | | Merge branch 'add-preview-image-border' into 'master' Fatih Acet2016-07-214-29/+24
|\ \ \ \
| * | | | Add image border in Markdown preview (!5162)winniehell2016-07-214-29/+24
* | | | | Merge branch 'gl-dropdown-enter-key-fix' into 'master' Fatih Acet2016-07-212-1/+15
|\ \ \ \ \
| * | | | | 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-202-0/+6
* | | | | | Merge branch 'doc-award-emoji' into 'master' Rémy Coutable2016-07-211-2/+2
|\ \ \ \ \ \
| * | | | | | Update doc for award emoji APIRobert Schilling2016-07-211-2/+2
* | | | | | | Merge branch '20067-wiki-not-visible-from-web' into 'master' Rémy Coutable2016-07-214-29/+52
|\ \ \ \ \ \ \
| * | | | | | | Make Service.external_wikis return only active external wikisRémy Coutable2016-07-214-29/+52
* | | | | | | | Merge branch '20041-gitlab-workhorse-version-should-be-update-to-0-7-8-in-our...Rémy Coutable2016-07-212-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update gitlab-workhorse version to 0.7.8 in installation and update guidesRémy Coutable2016-07-212-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'artifacts-from-ref-and-build-name-api' into 'master' Rémy Coutable2016-07-219-43/+258
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into artifacts-from-ref-and-build-name-apiLin Jen-Shin2016-07-21150-649/+2182
| |\ \ \ \ \ \ \
| * | | | | | | | Workaround MySQL with INNER JOIN:Lin Jen-Shin2016-07-212-3/+12
| * | | | | | | | Just put setup directly in the test, feedback:Lin Jen-Shin2016-07-211-6/+4
| * | | | | | | | Cleanup the use of let, feedback:Lin Jen-Shin2016-07-211-8/+6