summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use simple Next/Prev paging for jobs to avoid large count queries on ↵disable-pages-on-jobsGreg Stark2018-01-113-2/+8
| | | | arbitrarily large sets of historical jobs
* Merge branch 'fix-use-of-append-in-mr-api-spec' into 'master'Grzegorz Bizon2018-01-111-1/+1
|\ | | | | | | | | Remove call to ProjectTeam#<< in MR API spec See merge request gitlab-org/gitlab-ce!16388
| * Remove call to ProjectTeam#<< in MR API specSean McGivern2018-01-111-1/+1
| |
* | Merge branch '38068-commits-count' into 'master'Yorick Peterse2018-01-1110-5/+137
|\ \ | |/ |/| | | | | | | | | Resolve "Store the number of merge request commits in merge_request_diffs.commits_count" Closes #38068 See merge request gitlab-org/gitlab-ce!16164
| * Denormalize commits count for merge request diffs38068-commits-countJan Provaznik2018-01-1010-5/+137
| | | | | | | | | | | | | | | | | | For each MR diff an extra 'SELECT COUNT()' is executed to get number of commits for the diff. Overall time to get counts for all MR diffs may be quite expensive. To speed up loading of MR info, information about number of commits is stored in a MR diff's extra column. Closes #38068
* | Merge branch '41613-fix-redundant-modal' into 'master'Filipa Lacerda2018-01-115-111/+134
|\ \ | | | | | | | | | | | | | | | | | | Make modal dialog common for Groups tree app Closes #41613 See merge request gitlab-org/gitlab-ce!16311
| * | Add changelog entryKushal Pandya2018-01-111-0/+5
| | |
| * | Update tests to cover modal dialogKushal Pandya2018-01-111-12/+54
| | |
| * | Add modal dialog for leave group actionKushal Pandya2018-01-111-11/+37
| | |
| * | Update tests for modal changesKushal Pandya2018-01-111-33/+7
| | |
| * | Move modal dialog to app root componentKushal Pandya2018-01-111-55/+31
| | |
* | | Merge branch 'patch-28' into 'master'Grzegorz Bizon2018-01-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fixed tiny typo in end_to_end_tests.md See merge request gitlab-org/gitlab-ce!16386
| * | | Update end_to_end_tests.mdAndrew Newdigate2018-01-111-1/+1
|/ / /
* | | Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' ↵Grzegorz Bizon2018-01-113-8/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356
| * | | Give appropriate credit to Ben305 in the changelogBen305/gitlab-ce-36669-default-mr-title-with-external-issuesSean McGivern2018-01-101-2/+2
| | | |
| * | | Never set special MR titles for external issuesSean McGivern2018-01-102-6/+24
| | | |
| * | | Fix incorrect default merge request title when external issue tracker is ↵Benedikt Huss2018-01-093-3/+8
| | | | | | | | | | | | | | | | activated
* | | | Merge branch 'patch-28' into 'master'Sean McGivern2018-01-111-2/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | apply documentation changes from EE to CE See merge request gitlab-org/gitlab-ce!16381
| * | | | apply documentation changes from EE to CESascha Szott2018-01-111-2/+10
| | | | |
* | | | | Merge branch '4020-rebase-message' into 'master'Sean McGivern2018-01-113-10/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve 'Rebase fails with "something went wrong" and huge ugly conflict error.' Closes #41820 See merge request gitlab-org/gitlab-ce!16326
| * | | | | Store only generic message if rebase fails4020-rebase-messageJan Provaznik2018-01-093-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of storing detailed rebase error, only a generic message is stored with MR. The reason is that this message is exposed and displayed to end user and there is no reason to expose detailed backend information. Error message is still logged so detailed information can be found in logfile by admin if needed. Related #41820
* | | | | | Merge branch '39214__pipeline_api' into 'master'Sean McGivern2018-01-115-0/+92
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `pipelines` endpoint to merge requests API Closes #39214 See merge request gitlab-org/gitlab-ce!15454
| * | | | | | Fix styleTony Rom2018-01-103-4/+9
| | | | | | |
| * | | | | | Add `pipelines` endpoint to merge requests APITony Rom2017-12-155-0/+87
| | | | | | |
* | | | | | | Merge branch 'gcp-fix' into 'master'Kamil Trzciński2018-01-1112-47/+135
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GCP redirect Closes #41867 See merge request gitlab-org/gitlab-ce!16355
| * | | | | | | Update links for GCP instructionsgcp-fixFabio Busatto2018-01-111-3/+3
| | | | | | | |
| * | | | | | | Fix breadcumb of clusters show pageKamil Trzciński2018-01-111-1/+1
| | | | | | | |
| * | | | | | | Change failed GCP billing check wordingMatija Čupić2018-01-112-2/+2
| | | | | | | |
| * | | | | | | Refactor GCP redirect test suiteMatija Čupić2018-01-114-23/+90
| | | | | | | |
| * | | | | | | Use new tab for link in flashMatija Čupić2018-01-111-2/+1
| | | | | | | |
| * | | | | | | Add API requirements to docsMatija Čupić2018-01-111-5/+8
| | | | | | | |
| * | | | | | | Add missing user agent header to GCP clientMatija Čupić2018-01-111-2/+2
| | | | | | | |
| * | | | | | | Fix GCP Controller specMatija Čupić2018-01-111-1/+5
| | | | | | | |
| * | | | | | | Fix CheckGcpProjectBillingWorker specMatija Čupić2018-01-111-1/+1
| | | | | | | |
| * | | | | | | Fix CheckGcpProjectBillingService specMatija Čupić2018-01-111-2/+2
| | | | | | | |
| * | | | | | | Fix link to billingKamil Trzciński2018-01-102-2/+3
| | | | | | | |
| * | | | | | | Fix billing checkingKamil Trzciński2018-01-104-6/+9
| | | | | | | |
| * | | | | | | Extract GCP billing check as methodMatija Čupić2018-01-101-9/+20
| | | | | | | |
* | | | | | | | Merge branch 'docs/exclude-sast' into 'master'Rémy Coutable2018-01-111-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude sast job from being run in docs only changes Closes #41818 See merge request gitlab-org/gitlab-ce!16344
| * | | | | | | | Exclude sast job from being run in docs only changesdocs/exclude-sastJohn Doe2018-01-101-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'qa/gb/validate-qa-selectors' into 'master'Rémy Coutable2018-01-1132-16/+692
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate GitLab QA selectors Closes gitlab-qa#58 See merge request gitlab-org/gitlab-ce!16109
| * | | | | | | | | Fix using wrong `Your projects` link in QA testsqa/gb/validate-qa-selectorsGrzegorz Bizon2018-01-103-4/+8
| | | | | | | | | |
| * | | | | | | | | Expect QA selectors validation at least onceGrzegorz Bizon2018-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We call it for a second time in EE.
| * | | | | | | | | Fix few typos in QA selectors validation codeGrzegorz Bizon2018-01-102-2/+2
| | | | | | | | | |
| * | | | | | | | | Require qa:selectors sanity validation to passGrzegorz Bizon2018-01-101-1/+0
| | | | | | | | | |
| * | | | | | | | | Add temporary views coupling to all QA page objectsGrzegorz Bizon2018-01-1010-0/+65
| | | | | | | | | |
| * | | | | | | | | Use `warn` instead of `$stderr.puts` in QA selectors testGrzegorz Bizon2018-01-101-2/+2
| | | | | | | | | |
| * | | | | | | | | Fix QA selector class used to click on QA elementsGrzegorz Bizon2018-01-104-4/+15
| | | | | | | | | |
| * | | | | | | | | Add QA views / selectors coupling to group/project pagesGrzegorz Bizon2018-01-094-1/+23
| | | | | | | | | |
| * | | | | | | | | Add QA selectors coupling with sidebar menuGrzegorz Bizon2018-01-092-2/+8
| | | | | | | | | |
View Lorry Controller Status