An error occurred fetching the project authors.
- 09 Sep, 2016 7 commits
-
-
Razzeee authored
-
Achilleas Pipinellis authored
Minor update on CI docs examples cc @ayufan @markpundsack Commit message: > Triggered by gitlab-org/gitlab-ci-yml#1 I've investigated how this is organized so far and did a minor clean up. In my opinion we should just keep a list of up to date blog posts in the docs and examples should be included in gitlab-org/gitlab-ci-yml. This reduces the number of projects and docs pages one has to look for information. See merge request !5806
-
Jacob Vosmaer (GitLab) authored
Security and safety improvements for gitlab-workhorse integration Companion to https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/60 - Use a custom content type when sending data to gitlab-workhorse - Verify (using JWT and a shared secret on disk) that internal API requests came from gitlab-workhorse This will allow us to build features in gitlab-workhorse that require more trust, and protect us against programming mistakes in the future. This is designed so that no action is required for installations from source. For omnibus-gitlab we need to add code that manages the shared secret. See merge request !5907
-
Rémy Coutable authored
Fix intermittent spec failures with spec/features/issues/user_uses_slash_commands_spec.rb This MR solves the intermittent spec failure: ``` 1) Issues > User uses slash commands behaves like issuable record that supports slash commands in its description and notes note on issue with a note changing the issue's title when current user cannot change title of issue does not reopen the issue Failure/Error: Gitlab::Routing.url_helpers.namespace_project_url(self.namespace, self) ActionController::UrlGenerationError: No route matches {:action=>"show", :controller=>"projects", :id=>#<Project id: 1, name: "project135", path: "gitlabhq", description: nil, created_at: "2016-08-31 20:45:48", updated_at: "2016-08-31 20:45:48", creator_id: 2, issues_enabled: true, merge_requests_enabled: true, wiki_enabled: true, namespace_id: 2, snippets_enabled: true, last_activity_at: "2016-08-31 20:45:48", import_url: nil, visibility_level: 20, archived: false, avatar: nil, import_status: "none", repository_size: 0.0, star_count: 0, import_type: nil, import_source: nil, commit_count: 0, import_error: nil, ci_id: nil, builds_enabled: true, shared_runners_enabled: true, runners_token: "_rNZHgsHzaDWGbyL3L2F", build_coverage_regex: nil, build_allow_git_fetch: true, build_timeout: 3600, pending_delete: false, public_builds: true, pushes_since_gc: 0, last_repository_check_failed: nil, last_repository_check_at: nil, container_registry_enabled: true, only_allow_merge_if_build_succeeds: false, has_external_issue_tracker: false, repository_storage: "default", request_access_enabled: true, has_external_wiki: false, lfs_enabled: nil>, :namespace_id=>nil} missing required keys: [:namespace_id] Shared Example Group: "issuable record that supports slash commands in its description and notes" called from ./spec/features/issues/user_uses_slash_commands_spec.rb:6 # ./app/models/project.rb:611:in `web_url' # ./app/models/project.rb:975:in `hook_attrs' # ./lib/gitlab/data_builder/note.rb:58:in `build_base_data' # ./lib/gitlab/data_builder/note.rb:38:in `build' # ./app/services/notes/post_process_service.rb:19:in `hook_data' # ./app/services/notes/post_process_service.rb:23:in `execute_note_hooks' # ./app/services/notes/post_process_service.rb:14:in `execute' # ./app/workers/new_note_worker.rb:10:in `perform' # ./app/services/notes/create_service.rb:29:in `execute' # ./app/controllers/projects/notes_controller.rb:26:in `create' # ./lib/gitlab/request_profiler/middleware.rb:15:in `call' # ./lib/gitlab/middleware/go.rb:16:in `call' # ./lib/gitlab/middleware/static.rb:9:in `call' ``` There were a number of issues: 1. Sidekiq async tasks were being run after project namespaces were deleted. Use Sidekiq in fake mode to prevent this from Sidekiq tasks from being enqueued in the first place. 2. Some outstanding Ajax requests (e.g. autocomplete) were still being loaded while `DatabaseCleaner` ran 3. `logout` did not always wait for logout actually to complete Closes #21723 See merge request !6271
-
Z.J. van de Weg authored
Triggered by gitlab-org/gitlab-ci-yml#1 I've investigated how this is organized so far and did a minor clean up. In my opinion we should just keep a list of up to date blog posts in the docs and examples should be included in gitlab-org/gitlab-ci-yml. This reduces the number of projects and docs pages one has to look for information. [ci skip]
-
Rémy Coutable authored
Refresh todos count cache when an Issue/MR is deleted Fixes #21714 See merge request !6161
-
Rémy Coutable authored
* Moves splitting of `ps` result to helper. * Users a regexp to extract the different parts The result of `ps` at least depends on the _LANG_ and the distance of _start_ to _now_ (start time then the day + hour then month+day) I've tested with _LANG=en_US.UTF-8_ and _LANG=de_CH.UTF-8_ Closes #20632 See merge request !6245
-
- 08 Sep, 2016 33 commits
-
-
Stan Hu authored
-
Stan Hu authored
-
Stan Hu authored
-
Stan Hu authored
Sidekiq async tasks were being run after project namespaces were deleted. Use Sidekiq in fake mode to prevent this from Sidekiq tasks from being enqueued in the first place. Closes #21723
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Annabel Dunstone Gray authored
Give project selection dropdowns responsive width, long names wrap. ## What does this MR do? Makes two dropdown menus (branch name selector & project selector) wider on larger screens, and allows their contents to wrap. ## Are there points in the code the reviewer needs to double check? Sanity check. ## Why was this MR needed? Considered a regression, as users who relied on long branch names could no longer see them fully. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-30_at_2.50.43_PM](/uploads/e0252cb02c5f34f3c777d2d67028042f/Screen_Shot_2016-08-30_at_2.50.43_PM.png) After: ![Screen_Shot_2016-08-30_at_2.49.35_PM](/uploads/b504e0f3e139c85699bc5aafb58199f3/Screen_Shot_2016-08-30_at_2.49.35_PM.png) After (updated after fixes, including project selector): ![Screen_Shot_2016-09-02_at_1.46.53_PM](/uploads/b480fc8193f713ce43518cb83886fd52/Screen_Shot_2016-09-02_at_1.46.53_PM.png) ![Screen_Shot_2016-09-02_at_1.50.26_PM](/uploads/f0d31702668e83e6c0c24782cc43fdbd/Screen_Shot_2016-09-02_at_1.50.26_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #15633 See merge request !6105
-
Pascal Betz authored
-
Rémy Coutable authored
Smartly calculate real running time and pending time ## What does this MR do? Try to smartly calculate the running time and pending time for pipelines, instead of just use wall clock time from start to end. The algorithm is based on: > Suppose we have A, B, and C jobs: > * A: from 1 to 3 > * B: from 2 to 4 > * C: from 6 to 7 > The processing time should be accumulated from 1 to 4, and 6 to 7, totally 4, excluding retires, and calculate on `%w[success failed running canceled]` jobs (if a job is not finished yet, assume it's `Time.now`) ## Are there points in the code the reviewer needs to double check? I would actually like to test `Gitlab::Ci::PipelineDuration#process_segments`, but it's a private method right now and it's not very convenient to test it. Is there a way to test it without changing the original code too much? Note that I would like to avoid saving merged segments because it's not used and should be garbage collected. ## Screenshots: ![Screen_Shot_2016-09-05_at_6.45.32_PM](/uploads/a82bfaf316661091e383b743a2f11334/Screen_Shot_2016-09-05_at_6.45.32_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #18260, #19804 See merge request !6084
-
Rémy Coutable authored
Implement Slack integration for pipeline hooks ## What does this MR do? Add pipeline events to Slack integration ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug See merge request !5525
-
Rémy Coutable authored
Add bulk update support for merge requests list ## What does this MR do? Adds new feature: ability to update multiple merge requests at once from index page (same like we have for issues already) ## Are there points in the code the reviewer needs to double check? I don't think so ## Why was this MR needed? * consistency with issues * save user time when you want set same label/milestone to 20 merge requests ## Screenshots (if relevant) ![Screenshot_2016-09-08_11.48.49](/uploads/fe50b2472330e211eb8d6d6dafb15667/Screenshot_2016-09-08_11.48.49.png)![Screenshot_2016-09-08_11.48.46](/uploads/4833c3705120ec028f7a62a4e128998d/Screenshot_2016-09-08_11.48.46.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20087 See merge request !6226
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
-
Pascal Betz authored
Fix show template (missing tr) Separate exercise/verify
-
Annabel Dunstone Gray authored
Fix margin for awards-control buttons ## What does this MR do? Fixes margin in awards-control ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-06_at_10.58.03_AM](/uploads/b3fcd4103669bc7ae54a22093f492391/Screen_Shot_2016-09-06_at_10.58.03_AM.png) After: ![Screen_Shot_2016-09-06_at_10.54.54_AM](/uploads/dcd0e57a8cff82fe70990a9a8e2b1232/Screen_Shot_2016-09-06_at_10.54.54_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21896 See merge request !6233
-
Douwe Maan authored
Allow compare merge request versions ## What does this MR do? Add new functionality to the merge request page. It allows you easily compare merge request versions in one click. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To improve code review experience. ## Screenshots (if relevant) See discussion ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/13570 See merge request !6127
-
Jacob Vosmaer authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Kamil Trzciński authored
Enable rspec documentation formatter and color output Current rspec just outputs a `=` as each test runs. This enables the documentation formatter and color output to make it easier to know what is going on with each spec. See merge request !5924
-
Douwe Maan authored
Merge branch '21109-discussion-resolve-runs-a-single-update-query-per-note-but-should-run-a-single-update-query-for-all-notes-instead' into 'master' Optimize discussion notes resolving and unresolving ## What does this MR do? Optimize discussion notes resolving and unresolving ## Are there points in the code the reviewer needs to double check? Some changes had to be made to the discussion spec to account for the fact that notes are not individually updated now. I only focused on adapting them for the purpose of the regression fix, but admittedly they could be further improved in readability. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21109 See merge request !6141
-
Douwe Maan authored
Allow updating a branch by multiple commits In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6130 we made Repository#commit_with_hooks a bit too strict; it only allowed updating a branch by one commit. It turns out there is a feature in GitLab Enterprise Edition where we update by multiple commits. This change makes that possible, adds tests, and renames the method to the more appropriate 'update_branch_with_hooks'. See merge request !6246
-
Stan Hu authored
Update CHANGELOG entries for 8.11.5. See merge request !6255
-
Yorick Peterse authored
Change update interval of runners when trying to preserve contacted_at See merge request !6126
-
Rémy Coutable authored
Rename `gl_user_id` to `gitlab_user_id` in importer classes Closes #21772 See merge request !6254
-
Yorick Peterse authored
Fix DB schema to match latest migration See merge request !6256
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-