summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace stubbed data in merge request entity with real onedz-improve-mr-widget-jsonDmitriy Zaporozhets2017-03-011-4/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* MRWidget: MR changes. Mostly import and export.Fatih Acet2017-03-0111-65/+67
|
* MRWidget: Linter fixes.Fatih Acet2017-03-0110-46/+45
|
* MRWidget: Address MR feedbacks.Fatih Acet2017-03-017-45/+63
|
* MRWidget: Add archived state.Fatih Acet2017-03-015-8/+28
|
* MRWidget: Add WIP state.Fatih Acet2017-03-015-8/+38
|
* MRWidget: Add locked state.Fatih Acet2017-03-013-3/+27
|
* MRWidget: Merged and Closed states with Store.Fatih Acet2017-03-018-18/+202
|
* MRWidget: Initial commit.Fatih Acet2017-03-013-0/+20
|
* Refactor MergeRequestEntity for serializerDmitriy Zaporozhets2017-03-012-8/+25
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make sure source_project is set when call ↵Dmitriy Zaporozhets2017-03-011-1/+2
| | | | | | MergeRequest#can_remove_source_branch? method Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Expose more information in merge request serializerDmitriy Zaporozhets2017-03-014-53/+51
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'cla-first' into 'master' Achilleas Pipinellis2017-03-011-28/+37
|\ | | | | | | | | But notice first. See merge request !9364
| * Add CLA on top of CONTRIBUTING.mdAchilleas Pipinellis2017-03-011-28/+35
| | | | | | | | [ci skip]
| * But notice first.cla-firstsytses2017-02-191-8/+10
| |
* | Merge branch '28696-improve-grammar-gitlab-flow-doc' into 'master' Achilleas Pipinellis2017-03-012-1/+5
|\ \ | | | | | | | | | | | | | | | | | | Grammar improvement in gitlab flow intro doc Closes #28696 See merge request !9552
| * | Grammar improvement in gitlab flow intro docMarius Kleiner2017-03-012-1/+5
|/ /
* | Merge branch 'fix-builds-processing' into 'master' DJ Mountney2017-03-012-12/+69
|\ \ | | | | | | | | | | | | Fix concurrent access on builds/register See merge request !9600
| * | Fix concurrent access on builds/registerKamil Trzcinski2017-03-012-12/+69
|/ /
* | Merge branch '28808-fix-top-level-constant-referenced' into 'master' Rémy Coutable2017-03-011-1/+7
|\ \ | | | | | | | | | | | | | | | | | | Don't declare constants in Struct Closes #28808 See merge request !9582
| * | Don't declare constants in Struct28808-fix-top-level-constant-referencedRémy Coutable2017-02-281-1/+7
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '28818-tech-debt-pipelines-pagination' into 'master' Alfredo Sumaran2017-02-283-28/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pagination only changes the page parameter. Closes #28818 See merge request !9581
| * | | Pagination only changes the page parameter.28818-tech-debt-pipelines-paginationFilipa Lacerda2017-02-283-28/+15
| | | | | | | | | | | | | | | | Fix broken test
* | | | Merge branch '23602-show-milestone-id-in-a-consistent-way' into 'master' Alfredo Sumaran2017-02-284-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show milestone ID in a consistent way Closes #23602 See merge request !8820
| * \ \ \ Merge branch '23602-show-milestone-id-in-a-consistent-way' of ↵23602-show-milestone-id-in-a-consistent-wayPedro Moreira da Silva2017-02-240-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 23602-show-milestone-id-in-a-consistent-way
| | * | | | Format milestone header as issues and MRsPedro Moreira da Silva2017-01-262-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Enclose the identifier in strong * Use the % character as in GFM * Remove spaces around en dash for date range
| * | | | | Fix specsPedro Moreira da Silva2017-02-242-2/+2
| | | | | |
| * | | | | Format milestone header as issues and MRsPedro Moreira da Silva2017-02-242-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Enclose the identifier in strong * Use the % character as in GFM * Remove spaces around en dash for date range
* | | | | | Merge branch 'docs/pages' into 'master' Achilleas Pipinellis2017-02-2827-1288/+1292
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all Pages related content to a single location Closes #28819 and #28714 See merge request !9583
| * | | | | | Move all Pages related content to a single locationdocs/pagesAchilleas Pipinellis2017-02-2827-1288/+1292
| | | | | | |
* | | | | | | Merge branch '27622-cycle-analytics-loading' into 'master' Alfredo Sumaran2017-02-281-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Cycle Analytics -> Plan is loading forever Closes #27622 See merge request !9577
| * | | | | | | Clone nested objects from default data.27622-cycle-analytics-loadingFilipa Lacerda2017-02-281-2/+5
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks if key is present before accessing it Fix broken test
* | | | | | | Merge branch '26348-group-members-rearrange' into 'master' Dmitriy Zaporozhets2017-02-284-8/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `Group -> Members` to top-level, fix missing sub-nav for Subgroups Closes #28678 See merge request !9589
| * | | | | | | Move `Group -> Members` to top-level, fix missing sub-nav for SubgroupsKushal Pandya2017-02-284-8/+7
| | | | | | | |
* | | | | | | | Merge branch '27934-left-align-logo' into 'master' Dmitriy Zaporozhets2017-02-283-24/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Left align logo; increase max width of title Closes #27934 See merge request !9588
| * | | | | | | | Left align logo; increase max width of title27934-left-align-logoAnnabel Dunstone Gray2017-02-283-24/+17
| |/ / / / / / /
* | | | | | | | Merge branch '28661-ci-tables-buttons' into 'master' Annabel Dunstone Gray2017-02-287-113/+97
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI tables action buttons are hidden is smaller screens Closes #28661 See merge request !9578
| * | | | | | | | Remove hidden-xs classes from last columns in environments and pipelines table.28661-ci-tables-buttonsFilipa Lacerda2017-02-287-113/+97
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transform pipelines table css to match structure of pipelines table Make environments table overflow
* | | | | | | | Merge branch 'patch-14' into 'master' Filipa Lacerda2017-02-281-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document use of AirBnb js styleguide and eslint. See merge request !9558
| * | | | | | | | Add newline to end of frontend.md.patch-14Bryce Johnson2017-02-281-1/+1
| | | | | | | | |
| * | | | | | | | Document use of AirBnb js styleguide and eslint.Bryce Johnson2017-02-281-0/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'issue-tags-layout' into 'master' Annabel Dunstone Gray2017-02-282-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 'New Tag' layout on Tags page See merge request !9176
| * | | | | | | | | Fix 'New Tag' layout on Tags pageRobert Marcano2017-02-132-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch '6073_project_api' into 'master' Sean McGivern2017-02-286-10/+70
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API project create: Make name or path required Closes #6073 See merge request !9416
| * | | | | | | | | API project create: Make name or path requiredJarka Kadlecova2017-02-276-10/+70
| | | | | | | | | |
* | | | | | | | | | Update CHANGELOG.md for 8.17.126790-no-label-color-todosJames Lopez2017-02-2812-44/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch 'dm-dont-share-projects-with-group-ancestors' into 'master' Dmitriy Zaporozhets2017-02-282-3/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow a project to be shared with an ancestor of the group it is in Closes #28788 See merge request !9566
| * | | | | | | | | Don't allow a project to be shared with an ancestor of the group it is inDouwe Maan2017-02-282-3/+25
| | | | | | | | | |
* | | | | | | | | | Merge branch '27354-navigation-new-button' into 'master' Dmitriy Zaporozhets2017-02-283-0/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put back the new project button Closes #27354 See merge request !9426
| * | | | | | | | | Put back the new project button27354-navigation-new-buttonAnnabel Dunstone Gray2017-02-223-0/+9
| | | | | | | | | |