Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | Resolve mergeafter-script | Kamil Trzcinski | 2016-04-18 | 1 | -15/+0 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into after-script | Kamil Trzcinski | 2016-04-18 | 1 | -3/+37 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into after-script | Kamil Trzcinski | 2016-04-18 | 1 | -10/+27 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix rubocop complains | Kamil Trzcinski | 2016-04-18 | 1 | -27/+33 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Rename finally_script to after_script | Kamil Trzcinski | 2016-04-17 | 1 | -6/+6 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Implement finally_script which allows to do cleanups as part of the build ↵ | Kamil Trzcinski | 2016-04-16 | 1 | -2/+8 | |
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | process | |||||
* | | | | | | | | | Using single builder for push and tag events | Gabriel Mazetto | 2016-04-19 | 1 | -20/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Added System Hooks for push and tag_push | Gabriel Mazetto | 2016-04-19 | 1 | -1/+21 | |
| |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code is based on Project Webhooks, removing deprecations and without commits listing. | |||||
* | | | | | | | | Set GitHub milestones to Issue/Merge Request that were imported | Douglas Barbosa Alexandre | 2016-04-18 | 2 | -0/+14 | |
| | | | | | | | | ||||||
* | | | | | | | | Import milestones from GitHub | Douglas Barbosa Alexandre | 2016-04-18 | 2 | -1/+60 | |
| | | | | | | | | ||||||
* | | | | | | | | Apply GitHub labels to Issue/Merge Request that were imported | Douglas Barbosa Alexandre | 2016-04-18 | 1 | -0/+14 | |
| | | | | | | | | ||||||
* | | | | | | | | Import labels from GitHub | Douglas Barbosa Alexandre | 2016-04-18 | 2 | -1/+34 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'gh-keep-issues-prs-references' into 'master' | Robert Speicher | 2016-04-18 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GitHub Issue/PR number as iid to keep references Closes #15294 See merge request !3759 | |||||
| * | | | | | | | | Use GitHub Issue/PR number as iid to keep references | Douglas Barbosa Alexandre | 2016-04-18 | 2 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With these changes we don’t lost the issue/pr references when importing them to GitLab. | |||||
* | | | | | | | | | Add "action" tag to /internal/allowed API | Yorick Peterse | 2016-04-18 | 1 | -2/+4 | |
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to re-use any other analytics that rely on the "action" tag having a value set. | |||||
* | | | | | | | | Merge branch 'issue_3508' into 'master' | Douwe Maan | 2016-04-18 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict public users for private instances Implements #3508 See merge request !3440 | |||||
| * | | | | | | | Add changelog entry | Felipe Artur | 2016-04-18 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix documentation and improve permissions code | Felipe Artur | 2016-04-18 | 2 | -5/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Insert users check into api | Felipe Artur | 2016-04-18 | 2 | -2/+12 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Count the number of SQL queries per transaction | Yorick Peterse | 2016-04-18 | 1 | -0/+1 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15335 | |||||
* | | | | | | Minor refactorings in CI configfeature/ci-job-env-variables | Grzegorz Bizon | 2016-04-18 | 1 | -4/+7 | |
| | | | | | | ||||||
* | | | | | | Validate job-level variables in YAML config file | Grzegorz Bizon | 2016-04-18 | 1 | -0/+8 | |
| | | | | | | ||||||
* | | | | | | Minor refactoring in code related to job variables | Grzegorz Bizon | 2016-04-18 | 1 | -5/+1 | |
| | | | | | | ||||||
* | | | | | | Make CI config return empty array if no job variables | Grzegorz Bizon | 2016-04-18 | 1 | -2/+5 | |
| | | | | | | ||||||
* | | | | | | Rename method that returns global envs in CI conf | Grzegorz Bizon | 2016-04-18 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Read job variables directly from gitlab CI config | Grzegorz Bizon | 2016-04-18 | 1 | -2/+10 | |
| | | | | | | ||||||
* | | | | | | Add `variables` keyword to job in CI config YAML | Grzegorz Bizon | 2016-04-18 | 1 | -1/+2 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Use Module#prepend for method instrumentationfix-method-instrumentation | Yorick Peterse | 2016-04-18 | 1 | -10/+27 | |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using Module#prepend we can define a Module containing all proxy methods. This removes the need for setting up crazy method alias chains and in turn prevents us from having to deal with all that madness (e.g. methods calling each other recursively). Fixes gitlab-org/gitlab-ce#15281 | |||||
* | | | | Merge branch 'fix/project-import_url' into 'master' | Robert Speicher | 2016-04-15 | 12 | -47/+91 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for import_url fields on projects containing third-party credentials Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2658 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13955 See merge request !3066 | |||||
| * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-15 | 4 | -33/+22 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-14 | 28 | -136/+516 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * | | | | | | updated migration based on testing findings | James Lopez | 2016-04-14 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | refactored create_or_update_import_data | James Lopez | 2016-04-07 | 3 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | refactored a few things based on MR feedback | James Lopez | 2016-04-07 | 4 | -18/+8 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-07 | 14 | -20/+215 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * | | | | | | | fix some issues with credentials | James Lopez | 2016-04-06 | 2 | -7/+7 | |
| | | | | | | | | ||||||
| * | | | | | | | some refactoring to symbolise keys across importers and left a TODO | James Lopez | 2016-04-05 | 5 | -13/+13 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-05 | 2 | -0/+28 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-04-04 | 44 | -259/+455 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb | |||||
| * | | | | | | | | | corrected a couple of based on MR review | James Lopez | 2016-04-04 | 1 | -2/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | remove useless var | James Lopez | 2016-04-01 | 1 | -1/+0 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixes after more import testing | James Lopez | 2016-04-01 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix github import issues | James Lopez | 2016-04-01 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix fogbugz import | James Lopez | 2016-04-01 | 2 | -9/+8 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | more fixes after doing more manual testing on importing | James Lopez | 2016-03-29 | 2 | -2/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixing a few issues after testing imports | James Lopez | 2016-03-29 | 3 | -13/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixed failing specs | James Lopez | 2016-03-29 | 1 | -1/+5 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | refactored code based on feedback plus fixed a couple of other issues | James Lopez | 2016-03-28 | 6 | -41/+36 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-03-28 | 5 | -25/+100 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | |||||
| * | | | | | | | | | | added rest of importers, fixed specs and some issues with the migration | James Lopez | 2016-03-23 | 2 | -9/+13 | |
| | | | | | | | | | | |