summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fill missing authorized projects rowsfill-authorized-projectsYorick Peterse2017-01-113-0/+52
| | | | | | | This ensures that the project_authorizations rows exist for all users for which this data has not yet been populated. Fixes #26194
* Merge branch '25776-alerts-should-be-responsive' into 'master' Annabel Dunstone Gray2017-01-114-4/+23
|\ | | | | | | | | | | | | Resolve "Alerts should be responsive" Closes #25776 See merge request !8424
| * Removed `hidden-xs` class from alertsConnor Smallman2017-01-114-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Centered alert text and prevented alert actions links from floating right for viewports below medium width (992px) Centered alert text stopped alert actions from floating right for viewports below medium width (992px) Update styles to use correct screen width variable for max-width media query Added unreleased changelog Added class to alert links wrapper Updated styles for new class, float alert links on larger screens
* | Merge branch 'update-templates-8-16' into 'master' Rémy Coutable2017-01-1133-53/+294
|\ \ | | | | | | | | | | | | Update templates - 8.16 RC1 See merge request !8505
| * | add missing openshift templateupdate-templates-8-16James Lopez2017-01-101-0/+76
| | |
| * | update templatesJames Lopez2017-01-0933-127/+292
| | |
* | | Merge branch 'fix/rubocop-configuration-files' into 'master' Sean McGivern2017-01-112-410/+85
|\ \ \ | | | | | | | | | | | | | | | | Fix Rubocop configuration files to avoid CE to EE merge problems See merge request !8525
| * | | Fix Rubocop YAML config files to avoid CE->EE issuesGrzegorz Bizon2017-01-112-410/+85
|/ / /
* | | Merge remote-tracking branch 'dev/master'Robert Speicher2017-01-102-4/+20
|\ \ \
| * | | Update CHANGELOG.md for 8.13.11Douglas Barbosa Alexandre2017-01-101-0/+5
| | | | | | | | | | | | [ci skip]
| * | | Update CHANGELOG.md for 8.14.6Douglas Barbosa Alexandre2017-01-101-0/+5
| | | | | | | | | | | | [ci skip]
| * | | Update CHANGELOG.md for 8.15.4Douglas Barbosa Alexandre2017-01-092-4/+10
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'patch-turbolinks' into 'security'Robert Speicher2017-01-103-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | Updated Turbolinks to patched version of turbolinks-classic See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2048
* | | | Merge branch 'patch-8' into 'master' Achilleas Pipinellis2017-01-101-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Clarify instructions for importing Wiki/Merge Request data See merge request !8075
| * | | | Update html link to markdown linkpatch-8Lee Matos2016-12-151-1/+1
| | | | |
| * | | | applying style guide fixesLee Matos2016-12-151-1/+2
| | | | |
| * | | | Clarify instructions for importing Wiki/Merge Request dataLee Matos2016-12-131-0/+2
| | | | |
* | | | | Merge branch '26435-show-project-avatars-on-mobile' into 'master' Annabel Dunstone Gray2017-01-103-4/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Display project avatars on Admin Area and Projects pages for mobile views See merge request !8506
| * | | | | 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-092-4/+4
| | | | | |
* | | | | | Merge branch '26504-mr-discussion-btn' into 'master' Annabel Dunstone Gray2017-01-103-7/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26504 Fix styling of MR jump to discussion button Closes #26504 See merge request !8511
| * | | | | | 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
| | | | | | | | | |
View Lorry Controller Status