summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve disabled state selectfix-single-team-specsLuke "Jared" Bennett2017-01-132-8/+88
* Merge branch 'fix/rubocop-offenses-on-master' into 'master' Sean McGivern2017-01-103-5/+5
|\
| * Update Gemfile.lock to reflect Rubocop gem versionGrzegorz Bizon2017-01-101-1/+1
| * Fix Rubocop offenses in LDAP related code and specGrzegorz Bizon2017-01-102-4/+4
* | Merge branch 'patch-9' into 'master' Robert Schilling2017-01-101-1/+1
|\ \ | |/ |/|
| * fix changelog entry for !8425 Elan Ruusamäe2017-01-101-1/+1
* | Merge branch 'update-rubocop' into 'master' Sean McGivern2017-01-104-141/+534
|\ \
| * | Update rubocop and rubocop-rspec to fix build errorsupdate-rubocopBrian Neel2017-01-064-141/+534
* | | Merge branch 'restore-backup-when-env-variable-is-passed' into 'master' Sean McGivern2017-01-108-41/+150
|\ \ \ | |_|/ |/| |
| * | Restore backup correctly when "BACKUP" environment variable is passedrestore-backup-when-env-variable-is-passedAdam Niedzielski2017-01-095-36/+136
| * | Introduce "stub_env" test helper for safely stubbing environment variablesAdam Niedzielski2017-01-093-5/+14
* | | Merge branch '24139-production-wildcard-for-cycle-analytics' into 'master' Sean McGivern2017-01-104-7/+31
|\ \ \
| * | | Treat environments matching `production/*` as Production24139-production-wildcard-for-cycle-analyticsToon Claes2017-01-094-7/+31
* | | | Merge branch '26129-add-link-to-branches-page' into 'master' Clement Ho2017-01-102-1/+6
|\ \ \ \
| * | | | squash 3 commitsKen Ding2017-01-102-1/+6
* | | | | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-0943-242/+2091
|\ \ \ \ \
| * | | | | fix eslint for spec global needed in pagination spec for 'fixture'auto-pipelines-vueRegis2017-01-091-0/+1
| * | | | | format duration in vue: time_ago computed property in a dynamic fashionRegis2017-01-091-2/+11
| * | | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-09186-611/+2105
| |\ \ \ \ \
| * | | | | | move param helper to common utilsRegis2017-01-094-23/+16
| * | | | | | use Turbolinks instead of window.pushState for paginationRegis2017-01-092-10/+4
| * | | | | | namespace getParametersByName to gl.utils instead of just glRegis2017-01-094-10/+13
| * | | | | | 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
| * | | | | | Fix pipeline stage graph test example false positiveGrzegorz Bizon2017-01-051-6/+7
| * | | | | | Fix pipelines feature specs after invalid mergeGrzegorz Bizon2017-01-051-15/+10
| * | | | | | 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-05142-747/+10874
| |\ \ \ \ \ \
| * | | | | | | Include pipeline-related resources if using relationGrzegorz Bizon2017-01-051-3/+1
| * | | | | | | Combine some tests in pipelines specs to speed it upGrzegorz Bizon2017-01-051-12/+20
| * | | | | | | 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-042-8/+20
| |\ \ \ \ \ \ \
| * | | | | | | | 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-0487-488/+845
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix Rubocop offense in pipelines feature spec fileGrzegorz Bizon2017-01-041-2/+1
| * | | | | | | | | Revert adding an invalid CI/CD status CSS classGrzegorz Bizon2017-01-041-14/+0