Commit Graph

814 Commits

Author SHA1 Message Date
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Z.J. van de Weg 6391406774
Add two more project templates
Related to !13108. Mostly this is just running the rake task and
changing the task a bit to catch cases like the project already existing
or so. The rake task moves archives to the vendor/project_template
directory, which are checked in too.
2017-08-15 12:55:54 +02:00
Jacob Vosmaer fab0c1eb80 Use existing BUNDLE_PATH for gitaly in local tests 2017-08-11 15:49:50 +02:00
Robert Speicher 420d835e5f Merge branch '36003-do-not-include-to-kernel' into 'master'
Don't include anything to Kernel only because of tasks

Closes #36003

See merge request !13380
2017-08-09 16:35:33 +00:00
Lin Jen-Shin 5d963fccab We shouldn't include utility methods everywhere 2017-08-08 23:14:29 +08:00
Lin Jen-Shin e26acdb11b Just extend main, rather than include to Kernel
Unfortunately rake doesn't have nested context,
everything just runs on a main rake object.
This is probably due to compatibility issue,
but anyway, we could just extend the object.
2017-08-08 22:20:16 +08:00
Jacob Vosmaer 5684528081 Unset BUNDLE_GEMFILE when installing Gitaly 2017-08-08 15:34:29 +02:00
Rémy Coutable feb8974cc8 Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into 'master'
Unset the `RUBYOPT` env variable before installing `gitaly-ruby`

Closes #35941 and #35967

See merge request !13313
2017-08-08 09:39:49 +00:00
Robert Speicher dd3d422193 Merge branch 'github' into 'master'
Improve GitHub importer

Closes #27429

See merge request !12886
2017-08-07 19:27:42 +00:00
Sean McGivern 4c8b666893 Merge branch 'zj-project-templates' into 'master'
Allow projects to be started from a template

Closes #32420

See merge request !13108
2017-08-07 19:24:14 +00:00
Douglas Barbosa Alexandre 812620527f Fix small typoe on GitHub import rake task 2017-08-07 13:06:12 -03:00
Douglas Barbosa Alexandre 51186e72c5 Use a custom root endpoint if defined on GH ominiauth provider settings 2017-08-07 13:06:12 -03:00
Douglas Barbosa Alexandre 81995317f9 Use project.import_url to fetch repositories from Github 2017-08-07 13:06:12 -03:00
Robert Speicher ff1fa39cd8 Merge branch 'gitaly-386-shell-config' into 'master'
Gitaly needs to know where to find gitlab-shell

See merge request !13306
2017-08-07 16:00:47 +00:00
Z.J. van de Weg db65499e26
Fix last feature test for project templates 2017-08-07 15:32:43 +02:00
Z.J. van de Weg 2e6aa4f25e
After merge cleanup 2017-08-07 15:09:14 +02:00
Filipa Lacerda 3b9012871d Merge branch 'master' into zj-project-templates
* master: (623 commits)
  Fix issues with pdf-js dependencies
  fix missing changelog entries for security release on 2017-01-23
  Update top bar issues icon
  Fix pipeline icon in contextual nav for projects
  Since mysql is not a priority anymore, test it less
  Fix order of CI lint ace editor loading
  Add container registry and spam logs icons
  Fix different Markdown styles
  Backport to CE for:
  Make new dropdown dividers full width
  Fix spec
  Fix spec
  Fix spec
  Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
  Add changelog
  Install yarn via apt in update guides
  Use long curl options
  fix
  Add a spec for concurrent process
  Remove monkey-patched Array.prototype.first() and last() methods
  ...
2017-08-07 11:09:50 +01:00
winniehell c6bf292efb Add custom linter for inline JavaScript to haml_lint (!9742) 2017-08-07 11:37:16 +02:00
Rémy Coutable 21937a157d
Print the setup steps and duration and fix an issue resulting in re-setuping GitLab Shell on each test run
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-04 17:27:50 +02:00
Rémy Coutable 201ce2cb55
Unset the RUBYOPT env variable before installing gitaly-ruby
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-04 16:10:52 +02:00
Rémy Coutable 805a28e6a1 Revert "Merge branch 'fix-gitaly-install' into 'master'"
This reverts commit 23c502b434, reversing
changes made to 1018ab0516.
2017-08-04 15:59:30 +02:00
Kim "BKC" Carlbäcker a92ccbcb9e Have raketask tell gitaly where to find shell 2017-08-04 13:54:41 +02:00
Rémy Coutable 6a29d3a487 Ensure we run installation Rake tasks in a clean env in TestEnv
If we call `system('rake', 'taks_name')`, `ENV['RUBYOPT']` is set to
`'-rbundler/setup'` but some tasks (e.g. `gitlab:gitaly:install` need
a clean env since they install their own Gem bundle.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-02 19:02:01 +02:00
Sean McGivern 90cb2aab38 Merge branch '28283-legacy-storage-format' into 'master'
[CE] Added Legacy Storage format

See merge request !13149
2017-08-01 12:24:24 +00:00
Z.J. van de Weg 09974de3e3
Create rake task to create project templates
First iteration, and some stuff is missing. But basically this rake task
does a clone of a project we've pointed it to. Than creates a project on
the GDK, which should be running in the background. This project is
exported, after which we move that archive to the location we need it.
We clean up by removing the generated project.

The first idea was to export the project on .com too, however than we
might run into ImportExport versions mismatch. This could've been
circumvented by checkout out an older commit locally. This however is
not needed yet, so we opted to not go this route yet, instead we will
iterate on what we got.
2017-08-01 13:00:51 +02:00
Jacob Vosmaer e99564568b CI fixes for gitaly-ruby 2017-08-01 10:48:46 +02:00
Gabriel Mazetto fb06a4d8fe Rename more path_with_namespace -> full_path or disk_path 2017-08-01 07:28:13 +02:00
Jacob Vosmaer 1631ad02fd Support the fact that Gitaly uses bundler 2017-07-27 16:35:40 +02:00
Phil Hughes 3256f6f404 Compile JS lang files before webpack compile
Closes #35615
2017-07-27 08:41:47 +01:00
Michael Kozono 6263ecd3a4 Add lower path index to redirect_routes 2017-07-25 09:22:30 -07:00
Alejandro Rodríguez c9c0606297 Improve version handling on component install tasks
Fixes an issue where, when using branch versions, the component wouldn't
be updated after the first branch checkout. We also save one step, since
checking out the FETCH_HEAD with `-f` already does what `reset --hard`
did.
2017-07-20 17:30:29 -04:00
Jacob Schatz 901319fc69 Merge branch '34831-remove-coffee-rails-gem' into 'master'
Remove coffee-rails gem

Closes #34831

See merge request !12715
2017-07-17 21:18:55 +00:00
Paul Charlton cb3b4a15e6 Support multiple Redis instances based on queue type 2017-07-11 03:35:47 +00:00
Takuya Noguchi a789ee2d1f Remove .coffee ext files for i18n 2017-07-08 00:40:10 +09:00
Timothy Andrew 8fa08ea3cd Implement review comments for !11963 from @adamniedzielski.
- Change double quotes to single quotes.
- Why is `OmniAuth.config.full_host` being reassigned in the integration test?
- Use `map` over `map!` to avoid `dup` in the `gitlab:info` rake task
- Other minor changes
2017-07-06 06:30:07 +00:00
Timothy Andrew 56754848dd Don't allow the `gitlab:env:info` rake task to mutate the list of omniauth providers.
- The test for `rake gitlab:env:info` executed the rake task, which mutated the
  list of omniauth providers, breaking subsequent tests relying on this list.

- I've changed the rake task to duplicate the providers list before modifying it.
2017-07-06 06:30:07 +00:00
Jacob Vosmaer 218da88e1a Enable gitaly token auth when testing 2017-06-20 17:42:54 +02:00
Sean McGivern 9a73b634ab Add table for files in merge request diffs
This adds an ID-less table containing one row per file, per merge request
diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised
currently, with the advantage that we can easily query the attributes of this
new table.

It does not migrate existing data, so we have fallback code when the legacy
st_diffs column is present instead. For a merge request diff to be valid, it
should have at most one of:

* Rows in this new table, with the correct merge_request_diff_id.
* A non-NULL st_diffs column.

It may have neither, if the diff is empty.
2017-06-16 18:30:01 +01:00
Alejandro Rodríguez 58821ebbb4 Stop using deprecated `path` field on Gitaly messages
This revealed an error in our configuration generation in
gitlab:gitaly:install rake task. The fix is included
2017-06-14 19:33:43 -04:00
Douwe Maan f1e4376fb9 Don't check if MailRoom is running on Omnibus 2017-06-09 10:58:11 -05:00
Brian Neel 9bc8932390 Merge branch '29690-rotate-otp-key-base' into 'master'
Add a Rake task to aid in rotating otp_key_base

Closes #29690

See merge request !11881
2017-06-06 03:24:10 +00:00
Douwe Maan 9464456597 Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'
backports changed import logic from pull mirroring feature into CE

See merge request !11850
2017-06-05 23:40:53 +00:00
Tiago Botelho 810866ecb6 backports changed import logic from pull mirroring feature into CE 2017-06-05 23:09:10 +01:00
Nick Thomas b2800ee0c7 Add a Rake task to aid in rotating otp_key_base 2017-06-05 22:17:52 +01:00
Sean McGivern d2f149539e Merge branch '28080-system-checks' into 'master'
SystemCheck library for executing checks from a rake task

See merge request !9173
2017-06-02 15:15:54 +00:00
Ruben Davila 9d699a90e3 Add new Rake task to simplify the compilation of PO files 2017-06-01 15:07:56 -05:00
Gabriel Mazetto d219f9a691 Fix BasicExecutor specs 2017-05-31 14:33:03 +02:00
Gabriel Mazetto 3f187751d4 Fixed and improved some existing checks and SystemCheck library 2017-05-31 14:33:03 +02:00
Gabriel Mazetto ecdbde3d95 Improve Specs and some fixes 2017-05-31 14:33:03 +02:00
Gabriel Mazetto 27e632758f Add ActiveUsers Check 2017-05-31 14:33:03 +02:00