summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix `rake db:seed_fu` not doing anything in CIsh-fix-seed-fu-ciStan Hu2018-01-023-3/+5
| | | | | | | | | The default behavior of seed_fu is to load the fixtures using the RAILS_ENV environment. In CI, since we set RAILS_ENV=test, nothing is ever loaded. Instead of `rake db:seed_fu`, use `rake gitlab:setup`, which sets up MySQL properly with limits. Closes #41517
* Merge branch 'fix/profile-settings-content-width' into 'master'Robert Speicher2017-12-292-0/+6
|\ | | | | | | | | Adjust content width for User Settings, GPG Keys See merge request gitlab-org/gitlab-ce!16093
| * Adjust content width for User Settings, GPG KeysGeorge Tsiolis2017-12-282-0/+6
| | | | | | | | - Limit content width for fixed layout
* | Merge branch 'fix/profile-settings-sidebar-heading' into 'master'Robert Speicher2017-12-293-4/+9
|\ \ | | | | | | | | | | | | Keep typographic hierarchy in User Settings See merge request gitlab-org/gitlab-ce!16090
| * | Keep typographic hierarchy in User SettingsGeorge Tsiolis2017-12-293-4/+9
| |/ | | | | | | | | - Authentication log - Notifications
* | Merge branch '41492-mr-comment-fix' into 'master'Sean McGivern2017-12-294-16/+78
|\ \ | | | | | | | | | | | | | | | | | | Fix links to old commits in merge request comments Closes #41492 See merge request gitlab-org/gitlab-ce!16152
| * | Fix links to old commits in merge requests41492-mr-comment-fixJarka Kadlecová2017-12-294-16/+78
| | |
* | | Merge branch '20035-pause-resume-runners' into 'master'Grzegorz Bizon2017-12-295-6/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add pause/resume button to project runners Closes #20035 See merge request gitlab-org/gitlab-ce!16032
| * | | Add pause/resume button to specific project runnersMario de la Ossa2017-12-275-6/+35
| | | |
* | | | Merge branch 'gitaly-encoding-helpers' into 'master'Grzegorz Bizon2017-12-299-80/+86
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move encoding methods to the more general EncodingHelper Closes gitaly#847 See merge request gitlab-org/gitlab-ce!16137
| * | | | Move encoding methods to the more general EncodingHelpergitaly-encoding-helpersAlejandro Rodríguez2017-12-289-80/+86
| | | | |
* | | | | Merge branch '38930-warmup' into 'master'Robert Speicher2017-12-281-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "First request after GDK server started is slow" Closes #38930 See merge request gitlab-org/gitlab-ce!16153
| * | | | | Warm up the app so it's fast for the 1st request38930-warmupLin Jen-Shin2017-12-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would make the application considered ready much slower, but when it's ready, then it's really ready. Before this change, it claims to be ready, but it's annoyingly slow for the first request with GDK. It's 100% 502 for me, for the first request. This shouldn't really affect production or so, because if it's really ready, it should be blazingly fast, and it should not slow things down too much. The culprit here is probably `ActionController::Base.helpers.asset_path` but this could make sure that anything else would load first, too.
* | | | | | Merge branch 'fix-abuse-reports-link-url' into 'master'Robert Speicher2017-12-282-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed abuse reports link url See merge request gitlab-org/gitlab-ce!16068
| * | | | | | Fixed abuse reports link urlmegos2017-12-282-1/+6
|/ / / / / /
* | | | | | Merge branch 'bump_mysql_gem' into 'master'Robert Speicher2017-12-283-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumped mysql2 gem version from 0.4.5 to 0.4.10. See merge request gitlab-org/gitlab-ce!16034
| * \ \ \ \ \ Merge branch 'bump_mysql_gem' of gitlab.com:asaparov-gitlab/gitlab-ce into ↵asaparov2017-12-210-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bump_mysql_gem
| | * | | | | | Bumped mysql2 gem version from 0.4.5 to 0.4.10.asaparov2017-12-193-3/+8
| | | | | | | |
| * | | | | | | Bumped mysql2 gem version from 0.4.5 to 0.4.10.asaparov2017-12-213-3/+8
| | | | | | | |
* | | | | | | | Merge branch '38869-milestone-select' into 'master'Jacob Schatz2017-12-286-221/+212
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Webpack Roadmap" Closes #38869 See merge request gitlab-org/gitlab-ce!16076
| * | | | | | | | Resolve "Webpack Roadmap"Constance Okoghenun2017-12-286-221/+212
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-bump-sidekiq-5.0.5' into 'master'Robert Speicher2017-12-281-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Sidekiq version to 5.0.5 See merge request gitlab-org/gitlab-ce!16151
| * | | | | | | | Bump Sidekiq version to 5.0.5sh-bump-sidekiq-5.0.5Stan Hu2017-12-281-3/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Minor changes: https://github.com/mperham/sidekiq/blob/master/Changes.md
* | | | | | | | Merge branch 'gitaly-opt-out' into 'master'Stan Hu2017-12-281-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixed Closes #38333 See merge request gitlab-org/gitlab-ce!16155
| * | | | | | | | Unmark Gitaly features as OPT_OUT until the gRPC proxy issue is fixedAlejandro Rodríguez2017-12-281-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'patch-11' into 'master'Robert Speicher2017-12-281-8/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/plantuml.md: use html tags so code fence example would work [ci skip] See merge request gitlab-org/gitlab-ce!16026
| * | | | | | | | | plantuml.md: use html tags so code fence example would workElan Ruusamäe2017-12-271-8/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch ↵Sean McGivern2017-12-282-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'show_proper_labels_in_board_issue_sidebar_when_issue_is_closed' into 'master' show None when issue is in closed list and no labels assigned Closes #40975 See merge request gitlab-org/gitlab-ce!15976
| * | | | | | | | added changelogChristiaan Van den Poel2017-12-171-0/+5
| | | | | | | | |
| * | | | | | | | remove the labelChristiaan Van den Poel2017-12-171-1/+0
| | | | | | | | |
* | | | | | | | | Update CHANGELOG.md for 10.3.2Tiago Botelho2017-12-282-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'table-flip-quick-action-docs' into 'master'Sean McGivern2017-12-281-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Table flip quick action docs See merge request gitlab-org/gitlab-ce!15820
| * | | | | | | | Table flip quick action docsVictor Wu2017-12-281-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch '24347-dont-post-system-note-when-branch-creation-fails' into ↵Stan Hu2017-12-273-3/+24
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix when branch creation fails don't post system note Closes #24347 See merge request gitlab-org/gitlab-ce!16142
| * | | | | | | Refactor success status in branch controllerMateusz Bajorski2017-12-271-3/+5
| | | | | | | |
| * | | | | | | Fix when branch creation fails don't post system noteMateusz Bajorski2017-12-263-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #24347
* | | | | | | | Merge branch 'gitaly-remotes-fix' into 'master'Stan Hu2017-12-271-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix feature flags for Gitaly's RemoteService RPCs See merge request gitlab-org/gitlab-ce!16150
| * | | | | | | Fix feature flags for Gitaly's RemoteService RPCsAlejandro Rodríguez2017-12-271-2/+2
|/ / / / / / /
* | | | | | | Merge branch 'sh-make-kib-human' into 'master'Filipa Lacerda2017-12-274-7/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Humanize the units of "Showing last X KiB of log" in job trace Closes #38613 See merge request gitlab-org/gitlab-ce!16147
| * | | | | | | Humanize the units of "Showing last X KiB of log" in job tracesh-make-kib-humanStan Hu2017-12-274-7/+12
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Closes #38613
* | | | | | | Merge branch 'sh-fix-mysql-migration-10-3' into 'master'Grzegorz Bizon2017-12-273-2/+44
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix migration for removing orphaned issues.moved_to_id values in MySQL and PostgreSQL Closes #41498 See merge request gitlab-org/gitlab-ce!16141
| * | | | | | Simplify implementation and allow for batch updates in MySQLStan Hu2017-12-271-27/+16
| | | | | | |
| * | | | | | Fix PostgreSQL implementation of migrationsh-fix-mysql-migration-10-3Stan Hu2017-12-273-3/+5
| | | | | | |
| * | | | | | Fix migration for removing orphaned issues.moved_to_id values in MySQLStan Hu2017-12-263-2/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://dev.mysql.com/doc/refman/5.7/en/update.html, "You cannot update a table and select from the same table in a subquery." Attempting to do so results in the error: ``` Mysql2::Error: Table 'issues' is specified twice, both as a target for 'UPDATE' and as a separate source for data ``` Instead, we can use a LEFT JOIN on the same table to make MySQL do the right thing. Closes #41498
* | | | | | | Merge branch 'fix_db_fixtures_06_teams' into 'master'Stan Hu2017-12-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gitlab::Access.values to Gitlab::Access.sym_options at 06_teams on development db fixtures See merge request gitlab-org/gitlab-ce!16144
| * | | | | | | Fix Gitlab::Access.values to Gitlab::Access.sym_options at 06_teams on ↵ogom2017-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development db fixtures
* | | | | | | | Update CHANGELOG.md for 10.3.1Tiago Botelho2017-12-276-26/+13
|/ / / / / / / | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'osw-use-atomic-reference-instead-atomic-fixnum' into 'master'Stan Hu2017-12-272-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Concurrent::AtomicReference instead AtomicFixnum Closes #41448 See merge request gitlab-org/gitlab-ce!16138
| * | | | | | Add changelogosw-use-atomic-reference-instead-atomic-fixnumOswaldo Ferreira2017-12-261-0/+5
| | | | | | |
| * | | | | | Use Concurrent::AtomicReference instead AtomicFixnumOswaldo Ferreira2017-12-261-1/+1
|/ / / / / /
View Lorry Controller Status