summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-123-0/+25
* Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-paramsRémy Coutable2017-01-112-27/+32
* Refactor authorized params in Admin::GroupsControllerRémy Coutable2017-01-111-2/+6
* Refactor authorized params in Admin::ApplicationSettingsControllerRémy Coutable2017-01-111-45/+70
* Merge branch 'side-by-side-fixed-width' into 'master' Fatih Acet2017-01-113-3/+52
|\
| * Keep max width on MR content on side by side viewside-by-side-fixed-widthAnnabel Dunstone Gray2017-01-053-3/+52
* | Merge branch '25776-alerts-should-be-responsive' into 'master' Annabel Dunstone Gray2017-01-113-4/+19
|\ \
| * | Removed `hidden-xs` class from alertsConnor Smallman2017-01-113-4/+19
* | | Merge branch '26435-show-project-avatars-on-mobile' into 'master' Annabel Dunstone Gray2017-01-102-4/+16
|\ \ \
| * | | Adjusted widths on Admin Area projects page to prevent misaligned floatsRyan Harris2017-01-091-0/+16
| * | | Display project avatars on Admin Area and Projects pages for mobile viewsRyan Harris2017-01-091-4/+0
* | | | 26504 Fix styling of MR jump to discussion button26504-mr-discussion-btntauriedavis2017-01-102-7/+6
* | | | Merge branch '24139-production-wildcard-for-cycle-analytics' into 'master' Sean McGivern2017-01-101-1/+1
|\ \ \ \
| * | | | Treat environments matching `production/*` as Production24139-production-wildcard-for-cycle-analyticsToon Claes2017-01-091-1/+1
* | | | | Merge branch '26129-add-link-to-branches-page' into 'master' Clement Ho2017-01-101-1/+2
|\ \ \ \ \
| * | | | | squash 3 commitsKen Ding2017-01-101-1/+2
* | | | | | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-0925-31/+1055
|\ \ \ \ \ \
| * | | | | | format duration in vue: time_ago computed property in a dynamic fashionRegis2017-01-091-2/+11
| * | | | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-0951-257/+423
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | move param helper to common utilsRegis2017-01-093-23/+15
| * | | | | | use Turbolinks instead of window.pushState for paginationRegis2017-01-092-10/+4
| * | | | | | namespace getParametersByName to gl.utils instead of just glRegis2017-01-093-6/+9
| * | | | | | use Object.assign instead of Vue.set - change duration to computed propRegis2017-01-072-7/+7
| * | | | | | remove bitwise disable on pipelines.js.es6Regis2017-01-061-1/+1
| * | | | | | remove disabled rules - not needed anymoreRegis2017-01-061-1/+0
| * | | | | | remove parenthesis around returned objects in pipelines.js.es6Regis2017-01-061-3/+3
| * | | | | | change 'pipelines.length' logic for spinnerRegis2017-01-061-1/+1
| * | | | | | fix flash and request logic in stageRegis2017-01-061-3/+5
| * | | | | | fix cssClasses in status componentRegis2017-01-061-2/+1
| * | | | | | add param_helper to utils - fix switch statement in paginationRegis2017-01-062-9/+11
| * | | | | | remove white spaceRegis2017-01-061-3/+0
| * | | | | | remove pipeline head component and use staic HTML insteadRegis2017-01-063-21/+10
| * | | | | | use switch for paginationRegis2017-01-061-12/+18
| * | | | | | no space for requires - all consistent syntax = change if logic for index.js.es6Regis2017-01-063-38/+31
| * | | | | | Remove invalid pipeline status icon nameGrzegorz Bizon2017-01-051-2/+1
| * | | | | | Simplifies the HTML strucutre in the mini pipeline graph to make it as simila...Filipa Lacerda2017-01-053-31/+16
| * | | | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-0572-537/+624
| |\ \ \ \ \ \
| * | | | | | | Include pipeline-related resources if using relationGrzegorz Bizon2017-01-051-3/+1
| * | | | | | | Include resources to speed up pipelines serializerGrzegorz Bizon2017-01-053-2/+2
| * | | | | | | fix pagination UIRegis2017-01-041-9/+12
| * | | | | | | Merge branch 'master' into auto-pipelines-vue - fixes haml lint errorRegis2017-01-041-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | use has_details to decide if link needs to be created or notRegis2017-01-041-1/+1
| * | | | | | | | make timeago 10 seconds instead of 1Regis2017-01-041-1/+1
| * | | | | | | | add margin-bottom to label css for more even spacingRegis2017-01-041-0/+4
| * | | | | | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-0449-390/+421
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Revert adding an invalid CI/CD status CSS classGrzegorz Bizon2017-01-041-14/+0
| * | | | | | | | | Show yaml error badge in pipelines page if presentGrzegorz Bizon2017-01-041-3/+3
| * | | | | | | | | fix haml_lint complaintsRegis2017-01-021-2/+2
| * | | | | | | | | fix pipelines/index.html.haml merge conflictRegis2017-01-02312-1121/+1365
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | do not make a url if no deatils_path is present - use '.tag' for ref in commi...Regis2017-01-022-2/+2