summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix ParserError not found7788_parse_license_management_reports_in_be-ceGilbert Roulot2018-12-032-1/+9
* DRY up CI parser instanciationGilbert Roulot2018-12-035-34/+28
* Fix styleGilbert Roulot2018-12-031-10/+10
* Make report comparison DRYerGilbert Roulot2018-12-035-35/+47
* Use DRY in test and license reports servicesGilbert Roulot2018-12-032-29/+57
* Merge branch 'patch-34' into 'master'Evan Read2018-12-031-1/+1
|\
| * slightly improve readabilityBM5k2018-11-291-1/+1
* | Merge branch 'bump_gpgme_gem' into 'master'Stan Hu2018-12-034-7/+12
|\ \
| * | Bump gpgme gem version from 2.0.13 to 2.0.18Abulhair Saparov2018-12-034-7/+12
|/ /
* | Merge branch 'workhorse-7-3-0' into 'master'Stan Hu2018-11-302-1/+6
|\ \
| * | Upgrade GitLab Workhorse to v7.3.0Nick Thomas2018-11-302-1/+6
* | | Merge branch 'rs-fix-todo-spec' into 'master'Stan Hu2018-11-301-1/+2
|\ \ \ | |/ / |/| |
| * | Add additional scope check to Todo#for_target specRobert Speicher2018-11-301-1/+2
|/ /
* | Merge branch 'docs-gitaly-debug' into 'master'Achilleas Pipinellis2018-11-301-0/+11
|\ \
| * | Add documentation reference to gitaly-debugJacob Vosmaer2018-11-301-0/+11
|/ /
* | Merge branch '6861-group-level-project-templates-ce' into 'master'Phil Hughes2018-11-3013-16/+86
|\ \
| * | Clarify support of subgroups as project template sourceDennis Tang2018-11-301-1/+1
| * | Update doc/user/group/index.md6861-group-level-project-templates-ceDennis Tang2018-11-301-1/+1
| * | Add docs for custom project templatesDennis Tang2018-11-302-0/+48
| * | Link group/index.md to group-level project templates pageDennis Tang2018-11-291-0/+5
| * | Backport changes from spec/migrations/clean_up_for_members_spec.rbRubén Dávila2018-11-271-2/+3
| * | Backport: Callout CSS, group edit selection JSDennis Tang2018-11-273-2/+15
| * | Backport from gitlab-org/gitlab-ee!6878Rubén Dávila2018-11-276-12/+15
* | | Merge branch 'if-52811-fix_namespaces_api_routing' into 'master'Nick Thomas2018-11-3052-63/+68
|\ \ \
| * | | Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routingImre Farkas2018-11-2852-63/+68
* | | | Merge branch 'patch-33' into 'master'Robert Speicher2018-11-301-1/+1
|\ \ \ \
| * | | | Fix Red/Orange data link markdownPhilippe Lafoucrière2018-11-301-1/+1
|/ / / /
* | | | Merge branch '51029-status-emoji-currently-replaces-avatar-on-mobile' into 'm...Filipa Lacerda2018-11-303-16/+5
|\ \ \ \
| * | | | Ensure that profile avatar displays on mobileBrandon Labuschagne2018-11-293-16/+5
* | | | | Merge branch 'docs/remove-link-and-fix-page' into 'master'Achilleas Pipinellis2018-11-301-8/+9
|\ \ \ \ \
| * | | | | Remove broken link and fix markdown formattingEvan Read2018-11-301-8/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'if-40385_fix_doc' into 'master'Achilleas Pipinellis2018-11-301-3/+2
|\ \ \ \ \
| * | | | | Improve wording on disabling impersonation in api/READMEImre Farkas2018-11-301-3/+2
* | | | | | Merge branch 'gt-externalize-app-views-invites' into 'master'Kushal Pandya2018-11-303-7/+36
|\ \ \ \ \ \
| * | | | | | Externalize strings from `/app/views/invites`George Tsiolis2018-11-273-7/+36
* | | | | | | Merge branch '53778-post-deployment-fix' into 'master'Yorick Peterse2018-11-301-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Move drop_site_statistics to be a post deployment migrationGabriel Mazetto2018-11-291-0/+0
* | | | | | | | Merge branch 'smooshpack-upgrade' into 'master'Filipa Lacerda2018-11-302-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgraded Codesandbox packagesPhil Hughes2018-11-302-11/+11
* | | | | | | | | Merge branch 'generalize-ci-config' into 'master'Grzegorz Bizon2018-11-3060-850/+841
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ci/config: generalize Config validation into Gitlab::Config:: moduleKamil Trzciński2018-11-2960-850/+841
* | | | | | | | | | Merge branch 'bw-fix-silence-stderr-typo' into 'master'Sean McGivern2018-11-301-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix typo in method name "silence_stderr"Brett Walker2018-11-291-2/+2
* | | | | | | | | | Merge branch 'ignore-failed-pipeline-creation-on-pipeline-schedule' into 'mas...Kamil Trzciński2018-11-306-16/+154
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Squashed commit of the following:Shinya Maeda2018-11-306-16/+154
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '54218-fix-mergeUrlParams' into 'master'Phil Hughes2018-11-303-19/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "mergeUrlParams wrong with fragment url"Thomas Holder2018-11-303-19/+48
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'winh-timeline-entry-component' into 'master'Kushal Pandya2018-11-309-368/+418
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace existing uses of timeline-entry with timeline entry componentWinnie Hellmann2018-11-299-372/+371
| * | | | | | | | | | Create shared timeline entry componentWinnie Hellmann2018-11-292-0/+51
| | |/ / / / / / / / | |/| | | | | | | |