summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rename to assignable_labels_endpoint51620-cannot-add-label-to-issue-from-boardBrett Walker2018-10-314-4/+4
|
* Dynamically store the valid label endpointBrett Walker2018-10-317-4/+56
| | | | | | In order to ensure we have the right endpoint to query for an issue's possible valid labels, we store that url in the issue object that gets passed to the frontend.
* Merge branch 'da-rubocop-whitelist-active-record-none' into 'master'Yorick Peterse2018-10-3114-31/+0
|\ | | | | | | | | Whitelist none method from ActiveRecord::Querying See merge request gitlab-org/gitlab-ce!22726
| * Whitelist none method from ActiveRecord::Queryingda-rubocop-whitelist-active-record-noneDouglas Barbosa Alexandre2018-10-3114-31/+0
| |
* | Merge branch 'prettify-all-remaining-things' into 'master'Filipa Lacerda2018-10-3186-2090/+2291
|\ \ | | | | | | | | | | | | Prettify remaining files with differences in CE and EE See merge request gitlab-org/gitlab-ce!22702
| * | Add prettier to static-analysis jobMike Greiling2018-10-311-0/+1
| | |
| * | Fix eslint violationsMike Greiling2018-10-313-1/+7
| | |
| * | Prettify remaining files with differences in CE and EEMike Greiling2018-10-3185-2089/+2283
| | |
* | | Merge branch 'leipert-migrate-gitlab-svgs' into 'master'Mike Greiling2018-10-319-14/+14
|\ \ \ | | | | | | | | | | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgs See merge request gitlab-org/gitlab-ce!22714
| * | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgsLukas Eipert2018-10-319-14/+14
| | | |
* | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master'Annabel Dunstone Gray2018-10-316-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quick links button styles Closes #52220 and #52063 See merge request gitlab-org/gitlab-ce!22657
| * | | | Fix quick links button stylesGeorge Tsiolis2018-10-296-6/+11
| | | | |
* | | | | Merge branch 'ce-7341-epics-extractor' into 'master'Douglas Barbosa Alexandre2018-10-312-15/+37
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Prepare Banzai to work with group issuables See merge request gitlab-org/gitlab-ce!22711
| * | | | Prepare Banzai to work with group issuablesce-7341-epics-extractorJarka Košanová2018-10-312-15/+37
| | | | |
* | | | | Merge branch 'add-docker-assets-image' into 'master'Robert Speicher2018-10-313-0/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Build an assets only container See merge request gitlab-org/gitlab-ce!22235
| * | | | | Build a docker container storing only the frontent assetsIan Baum2018-10-313-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Run as part of gitlab:assets:compile job * Will be used by omnibus-gitlab and the CNG images to avoid compiling multiple times https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22235
* | | | | | Merge branch 'docs-fix-markdown-guide' into 'master'Achilleas Pipinellis2018-10-311-46/+65
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Docs: update GFM guide See merge request gitlab-org/gitlab-ce!22719
| * | | | | Docs: update GFM guideMarcia Ramos2018-10-311-46/+65
|/ / / / /
* | | | | Merge branch '53335-cancel-job-redirects-to-job-page' into 'master'Grzegorz Bizon2018-10-313-15/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send continue parameter on for `cancel_path` Closes #53335 See merge request gitlab-org/gitlab-ce!22712
| * | | | | Use array syntax instead of dig for consistencySteve Azzopardi2018-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We are using hash[symbol][symbol] everywhere else in the test file.
| * | | | | Send continue parameter on for cancel_pathSteve Azzopardi2018-10-313-14/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21595 `ContinueParams` was introducted in the `Projects::JobController#cancel` since `continue` parameter is not present for in `cancel_path` for `Projects::JobController#show.sjon` the user is being redirect to the pipeline page, where it should be redirected to the current job page instead. Add the `continue` parameter as a query string for `cancel_path`.
* | | | | | Merge branch 'remove-ee-specific-code-from-plan-and-create-models' into 'master'Douglas Barbosa Alexandre2018-10-313-5/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Remove EE-specific code from 'Discussion' models See merge request gitlab-org/gitlab-ce!22687
| * | | | | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-modelsSean McGivern2018-10-263-5/+9
| | | | | |
* | | | | | Merge branch 'gl-ui-pagination' into 'master'Phil Hughes2018-10-313-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab-ui's pagination from global See merge request gitlab-org/gitlab-ce!22704
| * | | | | | Remove gitlab-ui's pagination from globalgl-ui-paginationClement Ho2018-10-303-2/+9
| | | | | | |
* | | | | | | Merge branch 'gl-ui-modal' into 'master'Phil Hughes2018-10-314-8/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab-ui's modal from global See merge request gitlab-org/gitlab-ce!22706
| * | | | | | | Remove gitlab-ui's modal from globalClement Ho2018-10-314-8/+18
|/ / / / / / /
* | | | | | | Merge branch 'gt-fix-ide-typos-in-props' into 'master'Phil Hughes2018-10-315-7/+12
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Fix typos in IDE props See merge request gitlab-org/gitlab-ce!22685
| * | | | | | Fix typos in IDE propsGeorge Tsiolis2018-10-305-7/+12
| | | | | | |
* | | | | | | Merge branch '53386-broken-master' into 'master'Phil Hughes2018-10-311-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds required prop to the post merge pipeline Closes #53386 See merge request gitlab-org/gitlab-ce!22715
| * | | | | | | Adds required prop to the post merge pipeline53386-broken-masterFilipa Lacerda2018-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two different MRs updating the same code were merged and this was not caught prior to merge. This MR adds the missing prop to the post merge pipeline
* | | | | | | | Merge branch 'ce-7927-filter-none-any-weight-issues-api' into 'master'Sean McGivern2018-10-311-4/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Split CE and EE params in issues API See merge request gitlab-org/gitlab-ce!22689
| * | | | | | | Extract EE params in issues API to separate moduleHeinrich Lee Yu2018-10-301-4/+13
| | | | | | | |
* | | | | | | | Merge branch 'docs/rs-implicit-feature-flags' into 'master'Sean McGivern2018-10-311-10/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document implicit feature flag checks Closes gitlab-org/release/framework#26 See merge request gitlab-org/gitlab-ce!22669
| * | | | | | | | Document implicit feature flag checksdocs/rs-implicit-feature-flagsRobert Speicher2018-10-291-10/+23
| | | | | | | | |
* | | | | | | | | Merge branch ↵Filipa Lacerda2018-10-3111-6/+70
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master' Resolve "Reword error message for internal CI unknown pipeline status" Closes #53056 See merge request gitlab-org/gitlab-ce!22474
| * | | | | | | | Copyedit documentation updates41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-againMatija Čupić2018-10-291-1/+16
| | | | | | | | |
| * | | | | | | | Fix rspec error text regexMatija Čupić2018-10-243-4/+5
| | | | | | | | |
| * | | | | | | | Fix wording in troubleshooting docsMatija Čupić2018-10-241-5/+9
| | | | | | | | |
| * | | | | | | | Regenerates pot filesFilipa Lacerda2018-10-245-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes documentation path a required prop
| * | | | | | | | Updates CI/CD documentation link in MR widgetFilipa Lacerda2018-10-243-3/+18
| | | | | | | | |
| * | | | | | | | Fix the troubleshooting docs linkMatija Čupić2018-10-243-4/+3
| | | | | | | | |
| * | | | | | | | Add docs linkMatija Čupić2018-10-243-1/+4
| | | | | | | | |
| * | | | | | | | Add CHANGELOG entryMatija Čupić2018-10-241-0/+5
| | | | | | | | |
| * | | | | | | | Add troubleshooting section to MR docsMatija Čupić2018-10-241-0/+10
| | | | | | | | |
| * | | | | | | | Change CI status error messageMatija Čupić2018-10-244-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'rpereira2_improve-usage-ping-info' into 'master'Evan Read2018-10-311-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add instructions to find the usage ping payload See merge request gitlab-org/gitlab-ce!22571
| * | | | | | | | | Add instructions to find the usage ping payloadReuben Pereira2018-10-311-1/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch '52992-absorb-qa-product-qa' into 'master'Douglas Barbosa Alexandre2018-10-3115-165/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Absorb product into factory See merge request gitlab-org/gitlab-ce!22698
| * | | | | | | | | CE: Absorb product into factoryLin Jen-Shin2018-10-3115-165/+55
|/ / / / / / / / /
View Lorry Controller Status