summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 26504 Fix styling of MR jump to discussion button26504-mr-discussion-btntauriedavis2017-01-103-7/+10
|
* Merge branch 'fix/rubocop-offenses-on-master' into 'master' Sean McGivern2017-01-103-5/+5
|\ | | | | | | | | Fix Rubocop offenses on `master` See merge request !8516
| * 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 See merge request !8512
| * fix changelog entry for !8425 Elan Ruusamäe2017-01-101-1/+1
| | | | | | | | the author and mr fields got swapped, see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8425#note_21021254
* | Merge branch 'update-rubocop' into 'master' Sean McGivern2017-01-104-141/+534
|\ \ | | | | | | | | | | | | Update rubocop and rubocop-rspec to fix build errors See merge request !8466
| * | 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 passed Closes #26090 See merge request !8477
| * | 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 Production for Cycle Analytics Closes #24139 See merge request !8500
| * | | Treat environments matching `production/*` as Production24139-production-wildcard-for-cycle-analyticsToon Claes2017-01-094-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Cycle Analytics, the environment `production` is treated as a special case, and used to update the `first_deployed_to_production_at` metric. With the Review Apps changes, slash syntax is used to group related environments in the list. This is mostly used for `review/<branch>` environments, but it's possible for people to have multiple production environments, and someone might then want to group them like `production/eu`, `production/us`, or even just make it look prettier with `production/www.example.com`. In any of these cases, the first deploy to one of these `production/*` environments now is treated as a Production deploy.
* | | | Merge branch '26129-add-link-to-branches-page' into 'master' Clement Ho2017-01-102-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add link to Branches page help text?" Closes #26129 See merge request !8377
| * | | | squash 3 commitsKen Ding2017-01-102-1/+6
| | | | |
* | | | | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-0943-242/+2091
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pipelines Vue See merge request !7196
| * | | | | 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 ↵Filipa Lacerda2017-01-053-31/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | similar as the one in haml as possible
| * | | | | | Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-05142-747/+10874
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (35 commits) Adds back removed class in merge request pipelines table Fix dropdown icon alignment Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups Adds CHANGELOG entry Removes unneeded `window` declaration Decreases font-size on login page Ensure internal Gitlab::Git references use the namespace Absorb gitlab_git Fix review comments. Add spec for note edit and fix one commented spec. Review fixes. Use gl.utils.isInViewport and improve gl.utils.animateToElement. Make sure elements share the same scope Hide edit warning element when form reverted. Remove unnecessary styling came from merge conflicts. Fix single note edit form specs. Separate edit form in Changes and Discussions tab. Fix warning styling for responsive design. Fix task list for single edit note widget changes. Fix notes spec. ...
| * | | | | | | 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
| | | | | | | | | |
View Lorry Controller Status