Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-10Remove unused `redirect_to_external_issue_tracker` methodMehdi Lahmam
Its usage has been removed at 2fa22a0729.
2017-08-08Merge branch 'master' into ideMike Greiling
* master: (86 commits) Show all labels 33874 confidential issue redesign Exclude merge_jid on Import/Export attribute configuration Resolve "User dropdown in filtered search does not load avatar on `master`" Re-add column locked_at on migration rollback Group-level new issue & MR using previously selected project [EE Backport] Update log audit event in omniauth_callbacks_controller.rb more eagerly bail when the state is prevented Move locked_at removal to post-deployment migration Add class to other sidebars Improve mobile sidebar reduce iterations by keeping a count of remaining enablers Store & use ConvDev percentages returned by Version app Store MergeWorker JID on merge request, and clean up stuck merges Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE DRY up caching in AbstractReferenceFilter Update CHANGELOG Add CHANGELOG entry Fix html structure Removes test for removed behavior Port form back to use form_tag ...
2017-08-07Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira
2017-08-04Fix ABC size of BlobController#showLuke "Jared" Bennett
2017-08-03Add render_error to blob JSONDouwe Maan
2017-08-03Clean up some backendDouwe Maan
2017-08-03Merge branch 'master' into ideDouwe Maan
2017-08-01Fix Issue board when using Ruby 2.4Rémy Coutable
In Ruby 2.4, Hash#compact exists and returns a Hash, while in Ruby 2.3, Hash#compact is implemented by Rails and returns a new `ActionController::Parameters` instance in this case. Also, `ActionController::Parameters#compact` is deprecated in Rails 5.1 so we're using `reject { |_, value| value.nil? }` instead. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-01Add option to use CommitLanguages RPCJacob Vosmaer
2017-07-31Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-31Add environment instance var to BlobController#show html respLuke "Jared" Bennett
2017-07-28render blob/show if not show_new_repo?Luke "Jared" Bennett
2017-07-28Merge branch '26890-sort-branches' into 'master'Rémy Coutable
This makes the default sort order for branches 'recently updated' rather than by name. Closes #26890 See merge request !8666
2017-07-28Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-27Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher
Prevent concurrent editing wiki Closes #1827 See merge request !9707
2017-07-27fetch gpg signature badges by ajaxAlexis Reigel
2017-07-26Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann
2017-07-25Merge branch 'backport-ee-2328' into 'master'Sean McGivern
Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328 See merge request !13022
2017-07-24Support both internal and external issue trackersJarka Kadlecova
2017-07-24Associate Issues tab only with internal issues trackerJarka Kadlecova
2017-07-23Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato
Conflicts: app/controllers/projects/wikis_controller.rb app/views/projects/wikis/edit.html.haml spec/features/projects/wiki/user_updates_wiki_page_spec.rb
2017-07-21Backport changes from ↵Nick Thomas
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2328
2017-07-21Rename build to pipeline for status badgesZ.J. van de Weg
First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This commit is renaming files and classes from build to pipeline. Also wording is editted to pipeline. Given `pipeline` had more characters than `build`, I've made the field a bit wider. The width now matchers the one for the coverage badge, so they look nice when in a table format, or in a list. As soon as this commit is merged to master, and released, the build.svg is deprecated, meaning that all users which already placed a badge should update it. However, to make sure it keeps working tests are added for this case.
2017-07-20Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett
2017-07-20Wrong data type when testing webhooksAlexander Randa
2017-07-18Fix external issue trackers redirectFelipe Artur
2017-07-14Update Pipeline's badge count in Merge Request and Commits view to match ↵Filipa Lacerda
real-time content
2017-07-14Merge branch ↵Grzegorz Bizon
'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes' into 'master' Remove the rest of `trigger_schedule` related codes Closes #32032 See merge request !12839
2017-07-14Revert "Merge branch 'revert-2c879643' into 'master'"Sean McGivern
This reverts merge request !12633
2017-07-14Make sure MergeRequest commit methods work when either compare_commits or ↵Douwe Maan
merge_request_diff is set
2017-07-13Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_scheduleShinya Maeda
2017-07-11Get single view working.Jacob Schatz
2017-07-07Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' ↵Jacob Schatz
into 'master' Resolve "Report abusive content from an issue or merge request" Closes #30281 See merge request !11786
2017-07-07Merge branch ↵Kamil Trzciński
'feature/intermediate/32568-adding-variables-to-pipelines-schedules' into 'master' Add variables to pipelines schedules Closes #32568 See merge request !12372
2017-07-07Native group milestonesFelipe Artur
2017-07-07Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann
2017-07-07Merge branch '34736-n-1-problem-on-milestone-page' into 'master'Douwe Maan
N+1 problems on milestone page Closes #34736 See merge request !12670
2017-07-07Revert parent param removalLuke "Jared" Bennett
2017-07-07Removed merge_request/issue state_event param parent and removed ↵Luke "Jared" Bennett
issuable_path helpers in favour of issuable_url helpers
2017-07-07Merge from master(Fix conflicts)Shinya Maeda
2017-07-07Remove update|admin_pipeline_schedule from Project, and grant it in ↵Kamil Trzcinski
PipelineSchedule
2017-07-07Avoid to repeat namespace querying on project milestoneTakuya Noguchi
2017-07-07merge from masterShinya Maeda
2017-07-07Use variable_params && variable_params_attributes in project ↵Shinya Maeda
variables_controller.rb
2017-07-07Use new project_variables_path in this MRShinya Maeda
2017-07-07gb nice catchesShinya Maeda
2017-07-07Adopt project_variable_path instead of namespace_project_variable_path. ↵Shinya Maeda
(Resolve confilct from master)
2017-07-07ayufan nice catchesShinya Maeda
2017-07-07Fix variables_controller.rb and formatShinya Maeda
2017-07-07Basic BE changeShinya Maeda
Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Basic BE change Fix static-snalysis Move the precedence of group secure variable before project secure variable. Allow project_id to be null. Separate Ci::VariableProject and Ci::VariableGroup Add the forgotton files Add migration file to update type of ci_variables Fix form_for fpr VariableProject Fix test Change the table structure according to the yorik advice Add necessary migration files. Remove unnecessary migration spec. Revert safe_model_attributes.yml Fix models Fix spec Avoid self.variable. Use becomes for correct routing. Use unique index on group_id and key Add null: false for t.timestamps Fix schema version Rename VariableProject and VariableGroup to ProjectVariable and GroupVariable Rename the rest of them Add the rest of files Implement CURD Rename codes related to VariableGroup and VariableProject FE part Remove unneccesary changes Make Fe code up-to-date Add protected flag to migration file Protected group variables essential package Update schema Improve doc Fix logic and spec for models Fix logic and spec for controllers Fix logic and spec for views(pre feature) Add feature spec Fixed bugs. placeholder. reveal button. doc. Add changelog Remove unnecessary comment godfat nice catches Improve secret_variables_for arctecture Fix spec Fix StaticAnlysys & path_regex spec Revert "Improve secret_variables_for arctecture" This reverts commit c3216ca212322ecf6ca534cb12ce75811a4e77f1. Use ayufan suggestion for secret_variables_for Use find instead of find_by Fix spec message for variable is invalid Fix spec remove variable.group_id = group.id godffat spec nitpicks Use include Gitlab::Routing.url_helpers for presenter spec