- 02 Feb, 2017 3 commits
-
-
James Edwards-Jones authored
-
James Edwards-Jones authored
-
James Edwards-Jones authored
-
- 01 Feb, 2017 20 commits
-
-
Achilleas Pipinellis authored
[ci skip]
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Achilleas Pipinellis authored
-
Sean McGivern authored
There is now a `Projects::Settings` module, for the members controller. Ensure that we get the actual settings, not that module.
-
Stan Hu authored
Due to autoloading and Ruby scoping, the .update file was never being updated due to this error: ``` NoMethodError: undefined method `pages' for Projects::Settings:Module from /opt/gitlab/embedded/service/gitlab-rails/app/services/projects/update_pages_configuration_service.rb:50:in `pages_update_file' from /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/metrics/instrumentation.rb:157:in `pages_update_file' from (irb):6 from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands/console.rb:110:in `start' from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands/console.rb:9:in `start' from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands/commands_tasks.rb:68:in `console' from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands/commands_tasks.rb:39:in `run_command!' from /opt/gitlab/embedded/lib/ruby/gems/2.3.0/gems/railties-4.2.7.1/lib/rails/commands.rb:17:in `<top (required)>' from bin/rails:9:in `require' ``` This error was caught and discarded quietly. This fix exercises this code and fixes the scope problem. Closes gitlab-com/infrastructure#1058
-
James Edwards-Jones authored
-
Valery Sizov authored
Ports change from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642
-
James Lopez authored
-
Rebecca Skinner authored
-
Michael authored
-
Nick Thomas authored
-
Kamil Trzcinski authored
-
Yorick Peterse authored
-
Grzegorz Bizon authored
-
Valery Sizov authored
-
- 31 Jan, 2017 17 commits
-
-
Timothy Andrew authored
================== = Implementation = ================== 1. The path of the page is of the form 'group/project/pages/domains/<domain_name>' 2. Rails looks at `params[:id]` (which should be the domain name), and finds the relevant model record. 3. Given a domain like `foo.bar`, Rails sets `params[:id]` to `foo` (should be `foo.bar`), and sets `params[:format]` to `bar` 4. This commit fixes the issue by adding a route constraint, so that `params[:id]` is set to the entire `foo.bar` domain name. ========= = Tests = ========= 1. Add controller specs for the `PagesDomainController`. These are slightly orthogonal to this bug fix (they don't fail when this bug is present), but should be present nonetheless. 2. Add routing specs that catch this bug (by asserting that the `id` param is passed as expected when it contains a domain name). 3. Modify the 'RESTful project resources' routing spec shared example to accomodate controllers where the controller path (such as `pages/domains`) is different from the controller name (such as `pages_domains`).
-
James Edwards-Jones authored
-
James Edwards-Jones authored
-
Achilleas Pipinellis authored
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/1333 [ci skip]
-
Achilleas Pipinellis authored
[ci skip]
-
Lin Jen-Shin authored
-
Kamil Trzcinski authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
Closes #323
-
Connor Shea authored
Adds algorithm to the pages domain key and remote mirror credentials encrypted attributes for forward compatibility with attr_encrypted 3.0.0. aes-256-cbc is the default algorithm for attr_encrypted 1.x, but the default is changed in 3.0 and thus must be declared explicitly. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4216/ for more information. This will prevent OpenSSL errors once the code from that MR is merged into EE.
-
Kamil Trzcinski authored
-
Nick Thomas authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Heather McNamee authored
-