summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'fix/ci-status-badge-view-specs' into 'master' Robert Speicher2017-03-011-0/+89
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add view specs for CI/CD detailed status badge Closes #25611 See merge request !9473
| * | | | | | | | | | | | Simplify view specs for commit status badge partialfix/ci-status-badge-view-specsGrzegorz Bizon2017-03-011-28/+33
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve readability in CI/CD status badge view testsGrzegorz Bizon2017-03-011-18/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add view specs for ci/cd detailed status badgeGrzegorz Bizon2017-03-011-0/+85
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '28850-fix-broken-migration' into 'master' Sean McGivern2017-03-012-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the inheritance column of services in DisableInvalidServiceTemplates migration Closes #28850 See merge request !9613
| * | | | | | | | | | | | Disable the inheritance column of services in DisableInvalidServiceTemplates ↵Rémy Coutable2017-03-012-4/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration The `unless defined?(Service)` was useless since in production env, models are eager loaded, thus we wouldn't disable the STI, resulting in the following error: The single-table inheritance mechanism failed to locate the subclass: 'GitlabCiService'. This error is raised because the column 'type' is reserved for storing the class in case of inheritance. Please rename this column if you didn't intend it to be used for storing the inheritance class or overwrite Service.inheritance_column to use another column for that information./opt/gitlab/embedded/service/gitlab-rails/db/post_migrate/20170211073944_disable_invalid_service_templates.rb:11:in `up' Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'undefined' into 'master' Achilleas Pipinellis2017-03-011-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace create_new_project_button.png See merge request !9403
| * | | | | | | | | | | | Replace create_new_project_button.pngWilliam Abernathy2017-02-211-0/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'update-yarn-docs' into 'master' Jacob Schatz2017-03-011-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs to reflect Yarn support added in 8.17 not 9.0 See merge request !9590
| * | | | | | | | | | | | | update install doc to reflect start of yarn dependencyupdate-yarn-docsMike Greiling2017-02-281-4/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'feature/fix_tag_docs_parent_ids' into 'master' Rémy Coutable2017-03-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Tags: Fix typo in parent_ids in example response See merge request !9550
| * | | | | | | | | | | | | | Docs: Tags: Fix typo in parent_ids in example responseMichael Frister2017-02-271-2/+2
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-011-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about how to use or escape variables inside other variables See merge request !9601
| * | | | | | | | | | | | | | Add note about how to use or escape variables inside other variablesTeNNoX2017-02-281-0/+10
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'board-new-issue-template-in-js' into 'master' Filipa Lacerda2017-03-017-91/+299
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved issue boards new issue form template See merge request !9572
| * | | | | | | | | | | | | | | Import vue into specboard-new-issue-template-in-jsPhil Hughes2017-03-011-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed eslintPhil Hughes2017-03-011-11/+13
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved issue boards new issue form templatePhil Hughes2017-03-017-91/+297
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'refactor/generalize-unique-internal-users' into 'master' Sean McGivern2017-03-011-14/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generalize the idea of a "unique internal user" See merge request !9562
| * | | | | | | | | | | | | | | use a more namespacey key for the exclusive leaserefactor/generalize-unique-internal-usershttp://jneen.net/2017-02-281-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | generalize the idea of a "unique internal user"http://jneen.net/2017-02-281-14/+22
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we will likely be needing this for other features, for example the Gitlab ServiceDesk support bot.
* | | | | | | | | | | | | | | Update CHANGELOG.md for 8.17.2James Lopez2017-03-011-0/+4
| |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | Merge branch 'restructure-pages-docs' into 'master' Achilleas Pipinellis2017-03-015-582/+611
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restructure pages docs Closes #28688 See merge request !9527
| * | | | | | | | | | | | | | Restructure Pages docs index and getting started guidesrestructure-pages-docsMarcia Ramos2017-03-015-582/+611
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | Merge branch '25437-just-emoji' into 'master'Sean McGivern2017-03-0116-86/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #25437 Allow posting of just an emoji in comment; add /award slash command Closes #25437 See merge request !9382
| * | | | | | | | | | | | | add /award slash commandmhasbini2017-02-2816-86/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add /award slash command; Allow posting of just an emoji in comment
* | | | | | | | | | | | | | Merge branch '22951-fix-todos-api-endpoint-error-for-commits' into 'master' Sean McGivern2017-03-014-8/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix todos API endpoint application error Closes #22951 See merge request !9351
| * | | | | | | | | | | | | | Remove on_commit trait from todos factoryGeorge Andrinopoulos2017-02-281-5/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add spec for todo with target_type CommitGeorge Andrinopoulos2017-02-214-7/+17
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix todos API endpoint application errorGeorge Andrinopoulos2017-02-171-1/+5
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '28837-remove-help-duplicate' into 'master' Dmitriy Zaporozhets2017-03-013-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove help from right dropdown Closes #28837 See merge request !9594
| * | | | | | | | | | | | | | Remove help from right dropdown28837-remove-help-duplicateAnnabel Dunstone Gray2017-02-283-3/+5
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | |