summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve consistency of pipeline jobs namingfix/gb/improve-consistency-of-pipeline-jobs-namingGrzegorz Bizon2017-12-181-11/+11
|
* Optimize QA pipeline and don't run irrelevant jobsGrzegorz Bizon2017-12-181-1/+23
|
* Merge branch 'fix_build_count_in_pipeline_success_maild' into 'master'Grzegorz Bizon2017-12-188-7/+28
|\ | | | | | | | | | | | | Fix job count in pipeline success mail Closes #30483 See merge request gitlab-org/gitlab-ce!15827
| * Fix job count in pipeline success mailChristiaan Van den Poel2017-12-188-7/+28
|/
* Merge branch 'laravel-with-gitlab-docs' into 'master'Rémy Coutable2017-12-181-1/+1
|\ | | | | | | | | With laravel's package auto-discovery, the composer install fails when it tries… See merge request gitlab-org/gitlab-ce!15950
| * With laravel's package auto-discovery, the composer install fails when it ↵Samuel2017-12-151-1/+1
| | | | | | | | tries to install Dusk as it thinks it's running in production
* | Merge branch 'patch-25' into 'master'Rémy Coutable2017-12-181-0/+1
|\ \ | | | | | | | | | | | | I'm currently the proofreader of Italians Translations, i've started to… See merge request gitlab-org/gitlab-ce!15909
| * | I'm currently the proofreader of Italians Translations, i've started to ↵Paolo Falomo2017-12-131-0/+1
| | | | | | | | | | | | translate GitLab even before Crowdin. Can i be mentioned?
* | | Merge branch '39974-toggle-sidebar-btn' into 'master'Phil Hughes2017-12-181-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Stop toggle sidebar button from changing height on collapse Closes #39974 See merge request gitlab-org/gitlab-ce!15944
| * | | Stop toggle sidebar button from changing height on collapse39974-toggle-sidebar-btnAnnabel Dunstone Gray2017-12-151-1/+2
| | | |
* | | | Merge branch 'skip-sast-on-ce' into 'master'Kamil Trzciński2017-12-161-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid running autodevops sast job on GitLab CE Closes gl-sast#3 See merge request gitlab-org/gitlab-ce!15962
| * | | | Avoid running autodevops sast job on GitLab CEskip-sast-on-ceAlessio Caiazza2017-12-151-1/+12
| | | | |
* | | | | Merge branch 'qa/rs-filter-by-name-subgroup' into 'master'Grzegorz Bizon2017-12-161-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Filter by subgroup name before determining if our group has a subgroup See merge request gitlab-org/gitlab-ce!15969
| * | | | | Filter by subgroup name before determining if our group has a subgroupqa/rs-filter-by-name-subgroupRobert Speicher2017-12-151-0/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assumed that the QA sandbox group would continually be wiped and re-created, and thus never have enough subgroups that the one we just created during a new run wouldn't appear on the first page. But we know what they say about assumptions.
* | | | | Merge branch 'qa/rs-screenshot-last-run' into 'master'Grzegorz Bizon2017-12-161-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only keep screenshots from last run for QA specs See merge request gitlab-org/gitlab-ce!15967
| * | | | | Only keep screenshots from last run for QA specsqa/rs-screenshot-last-runRobert Speicher2017-12-151-0/+3
| |/ / / /
* | | | | Merge branch '38019-hide-runner-token' into 'master'Clement Ho2017-12-1510-49/+223
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide runner token in CI/CD settings page Closes #38019 See merge request gitlab-org/gitlab-ce!15918
| * | | | | Hide runner token in CI/CD settings page38019-hide-runner-tokenEric Eastwood2017-12-1510-49/+223
| | |/ / / | |/| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38019
* | | | | Update CHANGELOG.md for 10.2.5Michael Kozono2017-12-1512-56/+20
| | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'bump-git-2-14-3' into 'master'Marin Jankovski2017-12-152-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change CI config to use new base image See merge request gitlab-org/gitlab-ce!15939
| * | | | | Change CI config to use new base imageBalasankar C2017-12-152-2/+2
|/ / / / /
* | | | | Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-1571-188/+766
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Add cop to make sure we don't use ivar in a module See merge request gitlab-org/gitlab-ce!12800
| * | | | Backport changes from EELin Jen-Shin2017-12-153-4/+4
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-151285-11368/+25617
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (671 commits) Make rubocop happy Use guard clause Improve language Prettify Use temp branch Pass info about who started the job and which job triggered it Docs: add indexes for monitoring and performance monitoring clearer-documentation-on-inline-diffs Add docs for commit diff discussion in merge requests sorting for tags api Clear BatchLoader after each spec to prevent holding onto records longer than necessary Include project in BatchLoader key to prevent returning blobs for the wrong project moved lfs_blob_ids method into ExtractsPath module Converted JS modules into exported modules spec fixes Bump gitlab-shell version to 5.10.3 Clear caches before updating MR diffs Use new Ruby version 2.4 in GitLab QA images moved lfs blob fetch from extractspath file Update GitLab QA dependencies ...
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-30549-4330/+10372
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (170 commits) support ordering of project notes in notes api Redirect to an already forked project if it exists Reschedule the migration to populate fork networks Create fork networks for forks for which the source was deleted. Fix item name and namespace text overflow in Projects dropdown Minor backport from EE fix link that was linking to `html` instead of `md` Backport epic tasklist Add timeouts for Gitaly calls SSHUploadPack over Gitaly is now OptOut fix icon colors in commit list Fix star icon color/stroke Backport border inline edit Add checkboxes to automatically run AutoDevops pipeline BE for automatic pipeline when enabling Auto DevOps I am certainly weary of debugging sidekiq but I don't think that's what was meant Ensure MRs always use branch refs for comparison Fix issue comment submit button disabled on GFM paste Lock seed-fu at the correct version in Gemfile.lock Improve indexes on merge_request_diffs ...
| * | | | | | Cache allowed_idsLin Jen-Shin2017-11-221-1/+1
| | | | | | |
| * | | | | | Fix a few layout errorLin Jen-Shin2017-11-223-2/+2
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-22533-2413/+4542
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (126 commits) Update VERSION to 10.3.0-pre Update CHANGELOG.md for 10.2.0 default fill color for SVGs ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` Use Redis cache for branch existence checks Update CONTRIBUTING.md: Link definition of done to criteria Use `make install` for Gitaly setups in non-test environments FileUploader should check for hashed_storage?(:attachments) to use disk_path Set the default gitlab-shell timeout to 3 hours Update composite pipelines index to include "id" Use arrays in Pipeline#latest_builds_with_artifacts Fix blank states using old css Skip confirmation user api Custom issue tracker Revert "check for `read_only?` first before seeing if request is disallowed" add `#with_metadata` scope to remove a N+1 from the notes' API Fix promoting milestone updating all issuables without milestone Batchload blobs for diff generation check for `read_only?` first before seeing if request is disallowed use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers` ...
| * | | | | | | Make it clear that this is an acceptable useLin Jen-Shin2017-11-221-5/+8
| | | | | | | |
| * | | | | | | Reword Instance variables in viewsLin Jen-Shin2017-11-221-8/+5
| | | | | | | |
| * | | | | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-2243-240/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use .rubocop.yml to exclude paths we don't care, rather than using the cop itself to exclude.
| * | | | | | | Explain how to disable it in the docLin Jen-Shin2017-11-222-3/+29
| | | | | | | |
| * | | | | | | Just define allowed_ids and override it with empty valueLin Jen-Shin2017-11-227-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if not needed for those sub-classes.
| * | | | | | | Updates based on feedbackLin Jen-Shin2017-11-227-121/+108
| | | | | | | |
| * | | | | | | Remove codes from bad mergeLin Jen-Shin2017-11-181-2/+0
| | | | | | | |
| * | | | | | | Allow initialize method and single ivarLin Jen-Shin2017-11-182-3/+46
| | | | | | | |
| * | | | | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1848-169/+193
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-171064-8722/+28956
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (507 commits) Add dropdowns documentation Convert migration to populate latest merge request ID into a background migration Set 0.69.0 instead of latest for codeclimate image De-duplicate background migration matchers defined in spec/support/migrations_helpers.rb Update database_debugging.md Update database_debugging.md Move installation of apps higher Change to Google Kubernetes Cluster and add internal links Add Ingress description from official docs Add info on creating your own k8s cluster from the cluster page Add info about the installed apps in the Cluster docs Resolve "lock/confidential issuable sidebar custom svg icons iteration" Update HA README.md to clarify GitLab support does not troubleshoot DRBD. Update license_finder to 3.1.1 Make sure NotesActions#noteable returns a Noteable in the update action Cache the number of user SSH keys Adjust openid_connect_spec to use `raise_error` Resolve "Clicking on GPG verification badge jumps to top of the page" Add changelog for container repository path update Update container repository path reference ...
| * | | | | | | | WIPLin Jen-Shin2017-11-069-29/+28
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-062924-32659/+79732
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1723 commits) Resolve "Editor icons" Refactor issuable destroy action Ignore routes matching legacy_*_redirect in route specs Gitlab::Git::RevList and LfsChanges use lazy popen Gitlab::Git::Popen can lazily hand output to a block Merge branch 'master-i18n' into 'master' Remove unique validation from external_url in Environment Expose `duration` in Job API entity Add TimeCop freeze for DST and Regular time Harcode project visibility update a changelog Put a condition to old migration that adds fast_forward column to MRs Expose project visibility as CI variable fix flaky tests by removing unneeded clicks and focus actions fix flaky test in gfm_autocomplete_spec.rb Use Gitlab::Git operations for repository mirroring Encapsulate git operations for mirroring in Gitlab::Git Create a Wiki Repository's raw_repository properly Add `Gitlab::Git::Repository#fetch` command Fix Gitlab::Metrics::System#real_time and #monotonic_time doc ...
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-25633-5098/+11440
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (168 commits) Update CHANGELOG.md for 10.0.1 Remove Grit settings from default settings Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Workaround for #38259 Workaround for n+1 in Projects::TreeController#show Removed old icons from project page Make branches page translatable fix typo in icons section Don't show it if there's no project. Update CHANGELOG.md for 10.0.0 Inform user that current shared projects will remain shared Allow the git circuit breaker to correctly handle missing repository storages Reserve refs/replace cos `git-replace` is using it Resolve "Better SVG Usage in the Frontend" Replace the 'project/service.feature' spinach test with an rspec analog Replace the 'project/shortcuts.feature' spinach test with an rspec analog Removed two legacy config options Fix rendering double note issue. IssueNotes: Switch back to Write pane when note cancel or submit. Upgrade Nokogiri because of CVE-2017-9050 ...
| * | | | | | | | | | Fix grammar: judge -> judgementLin Jen-Shin2017-09-191-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-1953-109/+220
| | | | | | | | | | |
| * | | | | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1881-34/+475
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into 'master'Rémy Coutable2017-12-152-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix issue #39843 Incorrect guidance stating blocked users will be removed from groups and projects as members Closes #39843 See merge request gitlab-org/gitlab-ce!15947
| * | | | | | | | | | | fix issue #39843 Incorrect guidance stating blocked users will be removed ↵Cesar Apodaca2017-12-152-1/+6
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from groups and projects as members
* | | | | | | | | | | Merge branch '38239-update-toggle-design' into 'master'Filipa Lacerda2017-12-156-51/+81
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update feature toggle design to use icons and make it i18n friendly Closes #38239 See merge request gitlab-org/gitlab-ce!15904
| * | | | | | | | | | Add changelog entry38239-update-toggle-designKushal Pandya2017-12-151-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Update tests for toggle design changeKushal Pandya2017-12-151-3/+11
| | | | | | | | | | |
| * | | | | | | | | | Update toggle styles to use iconsKushal Pandya2017-12-151-30/+34
| | | | | | | | | | |