summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25209-improve-length-validators' into 'master' Rémy Coutable2016-12-077-19/+31
|\
| * Use :maximum instead of :within for length validators with a 0..N range25209-improve-length-validatorsRémy Coutable2016-12-067-19/+31
* | Merge branch 'excoveralls_coverage' into 'master' Rémy Coutable2016-12-071-0/+3
|\ \
| * | Add excoveralls examplePotHix2016-12-051-0/+3
* | | Merge branch 'remove-has-visible-content-caching' into 'master' Douwe Maan2016-12-071-13/+1
|\ \ \
| * | | Remove caching of Repository#has_visible_content?remove-has-visible-content-cachingYorick Peterse2016-12-061-13/+1
* | | | Merge branch 'remove-pages-css' into 'master' Jacob Schatz2016-12-065-35/+6
|\ \ \ \
| * \ \ \ Merge branch 'master' into 'remove-pages-css'remove-pages-cssAnnabel Dunstone Gray2016-12-0617-250/+187
| |\ \ \ \
| * | | | | Remove confirmation.scssAnnabel Dunstone Gray2016-12-062-35/+4
| * | | | | Move award emojis to framworkAnnabel Dunstone Gray2016-12-062-0/+2
| * | | | | Move image styles to frameworkAnnabel Dunstone Gray2016-12-061-0/+0
* | | | | | Merge branch 'remove-dashboard-css' into 'master' Jacob Schatz2016-12-062-49/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove dashboard.scssAnnabel Dunstone Gray2016-12-062-49/+0
| |/ / / /
* | | | | Merge branch 'remove-tags-scss' into 'master' Jacob Schatz2016-12-064-57/+60
|\ \ \ \ \
| * | | | | Remove tags.scssremove-tags-scssAnnabel Dunstone Gray2016-12-064-57/+60
| |/ / / /
* | | | | Merge branch 'admin-scss' into 'master' Jacob Schatz2016-12-0613-193/+127
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove admin.scssadmin-scssAnnabel Dunstone Gray2016-12-0511-139/+99
| * | | | Truncate fix, remove unneeded admin-specific cssAnnabel Dunstone Gray2016-12-055-54/+28
* | | | | Merge branch '23589-open-issue-for-mr' into 'master' Sean McGivern2016-12-0614-10/+157
|\ \ \ \ \
| * | | | | Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-0514-10/+157
* | | | | | Merge branch '24733-archived-project-merge-request-count' into 'master' Sean McGivern2016-12-065-7/+19
|\ \ \ \ \ \
| * | | | | | Fix Archived project merge requests add to group's Merge RequestsJacopo2016-12-055-7/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'zj-guest-reads-public-builds' into 'master' Sean McGivern2016-12-062-3/+7
|\ \ \ \ \ \
| * | | | | | Update effected testszj-guest-reads-public-buildsZ.J. van de Weg2016-12-041-3/+0
| * | | | | | Guests can read builds if those are publicZ.J. van de Weg2016-12-042-0/+7
* | | | | | | Merge branch 'refine-ci-statuses' into 'master' Kamil Trzciński2016-12-065-7/+34
|\ \ \ \ \ \ \
| * | | | | | | Use detailed status as CSS class in pipelines listGrzegorz Bizon2016-12-061-1/+1
| * | | | | | | Use status text when redering pipelines listGrzegorz Bizon2016-12-061-1/+1
| * | | | | | | Improve support for icons in new detailed statusesGrzegorz Bizon2016-12-061-1/+0
| * | | | | | | Add status label information to pipeline headerGrzegorz Bizon2016-12-061-0/+1
| * | | | | | | Untangle status label and text in ci status helperGrzegorz Bizon2016-12-061-2/+10
| * | | | | | | Simplify ci status helper with detailed statusGrzegorz Bizon2016-12-061-22/+22
| * | | | | | | Remove unsued variable from merge request widgetGrzegorz Bizon2016-12-061-2/+1
| * | | | | | | Restore legacy statuses support in ci status helpersGrzegorz Bizon2016-12-061-0/+4
| * | | | | | | Add support for detailed status to status helpersGrzegorz Bizon2016-12-053-24/+36
| * | | | | | | Expose pipeline detailed status using status factoryGrzegorz Bizon2016-12-051-0/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'glm-shorthand-reference' into 'master' Sean McGivern2016-12-0611-73/+71
|\ \ \ \ \ \ \
| * | | | | | | Add shorthand support to gitlab markdown referencesOswaldo Ferreira2016-12-0211-73/+71
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix/authorize-users-into-imported-gitlab-project' into 'master' Sean McGivern2016-12-061-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Authorize users into imported GitLab projectfix/authorize-users-into-imported-gitlab-projectAhmad Sherif2016-12-051-0/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '25202-fix-mr-widget-content-wrapping' into 'master' Jacob Schatz2016-12-061-0/+5
|\ \ \ \ \ \
| * | | | | | Fixed MR widget content wrapping for XS viewportsRyan Harris2016-12-051-0/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'issue_25064' into 'security' Douwe Maan2016-12-061-5/+8
* | | | | | Merge branch 'remove-errors-scss' into 'master' Jacob Schatz2016-12-051-16/+0
|\ \ \ \ \ \
| * | | | | | Remove unused errors cssremove-errors-scssAnnabel Dunstone Gray2016-12-051-16/+0
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'remove-votes-scss' into 'master' Jacob Schatz2016-12-051-4/+0
|\ \ \ \ \ \
| * | | | | | Remove unused votes.scssremove-votes-scssAnnabel Dunstone Gray2016-12-051-4/+0
| |/ / / / /
* | | | | | Merge branch 'feature/admin-user-groups-link' into 'master' Alfredo Sumaran2016-12-051-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | The admin user projects view now has a clickable group linkJames Gregory2016-12-021-1/+1
* | | | | | Merge branch '25221-fix-build-status-overflow-mobile' into 'master' Alfredo Sumaran2016-12-051-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |