Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | place the sentry config into a new file, and some changessentry-js | Arinde Eniola | 2016-04-19 | 1 | -1/+1 |
| | |||||
* | Add sentry logger to GitLab | Jacob Schatz | 2016-04-18 | 1 | -0/+1 |
| | |||||
* | 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 |
| | | | | | | | | |||||
| * | | | | | | | fogbugz importer, also refactored migration again to make it easier to add ↵ | James Lopez | 2016-03-23 | 2 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new importers | ||||
| * | | | | | | | fix rubocop warning | James Lopez | 2016-03-22 | 1 | -2/+0 |
| | | | | | | | | |||||
| * | | | | | | | fix gitlab import and spec | James Lopez | 2016-03-22 | 2 | -5/+7 |
| | | | | | | | | |||||
| * | | | | | | | first round of fixes and spec fixes | James Lopez | 2016-03-22 | 4 | -31/+32 |
| | | | | | | | | |||||
| * | | | | | | | encrypt credentials in project_creator for bitbucket by default | James Lopez | 2016-03-22 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | update bitbucket importer | James Lopez | 2016-03-22 | 2 | -6/+13 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-03-22 | 6 | -11/+29 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | James Lopez | 2016-03-21 | 3 | -1/+97 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb | ||||
| * | | | | | | | | | refactored code based on feedback | James Lopez | 2016-03-21 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fixed some rubocop warnings | James Lopez | 2016-03-21 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | fixed few issues with the migration | James Lopez | 2016-03-21 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | more refactoring | James Lopez | 2016-03-21 | 4 | -19/+25 |
| | | | | | | | | | | |||||
| * | | | | | | | | | some refactoring based on feedback | James Lopez | 2016-03-21 | 4 | -16/+28 |
| | | | | | | | | | |