summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Allow registration when LDAP is enabledml-qa-register-ldapMark Lapierre2018-09-245-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the login page object and related code so that a user can be registered when LDAP is enabled
* | | | | | | | | | | | | | Merge branch 'enable-force-write-auth-keys-restore' into 'master'Nick Thomas2018-09-253-3/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the ability to use the force env for rebuilding authorized_keys during a restore See merge request gitlab-org/gitlab-ce!21896
| * | | | | | | | | | | | | | Enable write to auth_keys file during restoreCindy Pallares2018-09-253-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fast lookup of authorized SSH keys in the database was ported to CE in v10.4. This change adds the option to enable the setting via the restore rake task and assumes yes if the force env variable is set.
* | | | | | | | | | | | | | | Merge branch 'ide-remove-stage-buttons' into 'master'Filipa Lacerda2018-09-256-69/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove stage/unstage buttons from IDE commit list items Closes #51695 See merge request gitlab-org/gitlab-ce!21845
| * | | | | | | | | | | | | | | Fixed alignment of changed icon in commit headide-remove-stage-buttonsPhil Hughes2018-09-251-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Updated specs to account for removed buttonsPhil Hughes2018-09-214-65/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Remove stage/unstage buttons from IDE commit list itemsPhil Hughes2018-09-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51695
* | | | | | | | | | | | | | | | Merge branch 'winh-destroy-mr-widget-polling' into 'master'Phil Hughes2018-09-252-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup polling of merge request widget in tests Closes gitlab-ee#7728 See merge request gitlab-org/gitlab-ce!21906
| * | | | | | | | | | | | | | | Cleanup polling of merge request widget in testsWinnie Hellmann2018-09-252-0/+6
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'ce-7013-add-epics-close-support' into 'master'Douglas Barbosa Alexandre2018-09-258-7/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of Adding state to epics See merge request gitlab-org/gitlab-ce!21771
| * | | | | | | | | | | | | | | Bacport FE changes from Closing Epicsce-7013-add-epics-close-supportJarka Košanová2018-09-246-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of js and vue files from closing epics
| * | | | | | | | | | | | | | | Add name definition for table methodJarka Košanová2018-09-241-0/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add specs for closing and reopening issueJarka Košanová2018-09-241-6/+23
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Douglas Barbosa Alexandre2018-09-255-4/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '51747-gitlab-com-unable-to-import-a-project-that-was-just-exported' into 'master' Resolve "gitlab.com: Unable to import a project that was just exported" Closes #43840, #43896, and #51747 See merge request gitlab-org/gitlab-ce!21875
| * | | | | | | | | | | | | | | | Add changelog. Add more specs.51747-gitlab-com-unable-to-import-a-project-that-was-just-exportedJames Lopez2018-09-243-0/+10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix null pipeline problemJames Lopez2018-09-244-4/+19
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'docs/version-and-tiers-guidance' into 'master'Marcia Ramos2018-09-251-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clarity to EE feature styles for features introduced before and after 9.2 See merge request gitlab-org/gitlab-ce!21874
| * | | | | | | | | | | | | | | | Add clarity to EE feature styles for features introduced before and after 9.2Evan Read2018-09-251-3/+15
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'mk/improve-usage-of-request-store' into 'master'Yorick Peterse2018-09-2537-155/+485
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Provide NullStore for RequestStore" Closes #51718 See merge request gitlab-org/gitlab-ce!21848
| * | | | | | | | | | | | | | | | Refactor Feature.flipper methodmk/improve-usage-of-request-storeMichael Kozono2018-09-242-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix typo in context 'when request store is active' * Rearrange test since the instance variable always gets set now, even if RequestStore is active
| * | | | | | | | | | | | | | | | Use `Gitlab::SafeRequestStore` in more placesMichael Kozono2018-09-2420-81/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if it doesn’t save lines of code, since people will tend to use code they’ve seen. And `SafeRequestStore` is safer since you don’t have to remember to check `RequestStore.active?`.
| * | | | | | | | | | | | | | | | Add note to docs about `Gitlab::SafeRequestStore`Michael Kozono2018-09-241-2/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Simplify by using Gitlab::SafeRequestStoreMichael Kozono2018-09-2411-60/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are clear wins.
| * | | | | | | | | | | | | | | | Use a null object with RequestStoreMichael Kozono2018-09-244-0/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it easier and safer to use RequestStore because you don't need to check `RequestStore.active?` before using it. You just have to use `Gitlab::SafeRequestStore` instead.
* | | | | | | | | | | | | | | | | Merge branch 'nik-doc-postgres-alignment' into 'master'Yorick Peterse2018-09-251-28/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgres alignment padding – logic fixed See merge request gitlab-org/gitlab-ce!21764
| * | | | | | | | | | | | | | | | Postgres alignment padding – logic fixed:nik-doc-postgres-alignmentNikolay OOO Sep 14 / Moscow timezone Sep 15-222018-09-201-28/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alignment padding is applied based on the next column's data type, so, for example, we cannot state that for "boolean" (1 byte of data), the alignment is not needed. This commit fixes the logic in the doc. Update ordering_table_columns.md Typos fixed more polishing of text Minor improvements of text style Get rid of two "following" words in one line, having different meanings More text style polishing according @eread's comments
* | | | | | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-09-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ldap.md If you escape the '\' character when using a "domain\user" scheme for the bind_dn name, it will fail. gitlab-ctl reconfigure escapes characters, and if you pre-escape the '\', the resultant yaml file will have four (4) '\' characters See merge request gitlab-org/gitlab-ce!20460
| * | | | | | | | | | | | | | | | | Update ldap.mdEd Goforth2018-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you escape the '\' character when using a "domain\user" scheme for the bind_dn name, it will fail. gitlab-ctl reconfigure escapes characters, and if you pre-escape the '\', the resultant yaml file will have four (4) '\' characters.
* | | | | | | | | | | | | | | | | | Merge branch 'deploy-tokens' into 'master'Rémy Coutable2018-09-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use redirect instead of render to avoid creating keys when refresh - resolves #47942 Closes #47942 See merge request gitlab-org/gitlab-ce!20363
| * | | | | | | | | | | | | | | | | | use redirect instead of render to avoid creating keys when refresh - ↵Muhammad Nuzaihan2018-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolves #47942
* | | | | | | | | | | | | | | | | | | Merge branch 'update-frontend-dependencies' into 'master'Tim Zallmann2018-09-252-508/+866
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update frontend tooling dependencies See merge request gitlab-org/gitlab-ce!21818
| * | | | | | | | | | | | | | | | | | Upgrade webpack-bundle-analyzer to latestupdate-frontend-dependenciesMike Greiling2018-09-242-41/+144
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Upgrade webpack and webpack-cliMike Greiling2018-09-242-199/+151
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Bump monaco-editor-webpack-plugin to latestMike Greiling2018-09-242-4/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Upgrade several webpack loadersMike Greiling2018-09-242-15/+15
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update karma dependenciesMike Greiling2018-09-241-133/+124
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Bump nodemon and commander dependenciesMike Greiling2018-09-242-6/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update babel test dependenciesMike Greiling2018-09-242-54/+181
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update webpack-dev-server to v3.1.8Mike Greiling2018-09-242-113/+187
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update compression-webpack-plugin to 2.xMike Greiling2018-09-242-8/+115
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'ide-refactor-for-ee-specific' into 'master'Phil Hughes2018-09-252-9/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor IDE index to support EE specific code See merge request gitlab-org/gitlab-ce!21895
| * | | | | | | | | | | | | | | | | | | Refactor IDE index to support EE specific codePaul Slaughter2018-09-242-9/+31
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** - The web terminal feature is EE specific and will need to inject some specific options / functions into certain components.
* | | | | | | | | | | | | | | | | | | Merge branch '50904-move-job-page-vue' into 'master'Phil Hughes2018-09-2516-368/+317
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Vue component for job artifacts, Commit and Trigger Variables See merge request gitlab-org/gitlab-ce!21777
| * | | | | | | | | | | | | | | | | | Use Vue component for job artifacts, Commit and Trigger VariablesFilipa Lacerda2018-09-2516-368/+317
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '51509-remove-sidekiq-limit-fetch' into 'master'Valery Sizov2018-09-2522-210/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove background job throttling feature Closes #51509 See merge request gitlab-org/gitlab-ce!21748
| * | | | | | | | | | | | | | | | | Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-2422-210/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We remove this feature as it never worked properly
* | | | | | | | | | | | | | | | | | Merge branch '51050-fix' into 'master'Annabel Dunstone Gray2018-09-242-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Collapsed open and closed sections in boards styling is broken" Closes #51050 See merge request gitlab-org/gitlab-ce!21868
| * | | | | | | | | | | | | | | | | | Resolve "Collapsed open and closed sections in boards styling is broken"Andrea Leone2018-09-242-1/+14
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch ↵Robert Speicher2018-09-243-104/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47818-post-comment-on-commit-when-downstream-pipeline-is-created-qa' into 'master' Post a commit note with the downstream pipeline URL for omnibus triggers See merge request gitlab-org/gitlab-ce!21512
| * | | | | | | | | | | | | | | | | Refactor scripts/trigger-build and post a commit note with the downstream ↵Rémy Coutable2018-09-243-104/+126
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pipeline URL for omnibus triggers Signed-off-by: Rémy Coutable <remy@rymai.me>