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
2016-05-17Fix spinach testsKamil Trzcinski
2016-05-17Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski
2016-05-14Fix spinach testsKamil Trzcinski
2016-05-14Update specsDouwe Maan
2016-05-13Codestyle: make sure we have space around operatorsGabriel Mazetto
2016-05-11Merge branch 'hook-docs-behavior' into 'master' Robert Speicher
Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
2016-05-10Add integration specs for tagsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-09Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable
Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043
2016-05-09Fix test failuresJacob Vosmaer
2016-05-05Merge branch 'master' into group-navigation-redesignDmitriy Zaporozhets
2016-05-05Backport changes from gitlab-org/gitlab-ee!372Robert Speicher
Mostly replaces several Spinach tests with RSpec Feature tests.
2016-05-04Merge branch 'clean-user-profile-classes' into 'master' Jacob Schatz
Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
2016-05-04Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable
Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
2016-05-04Merge branch 'fix-typo-in-user-steps' into 'master' Rémy Coutable
Fix typo in user steps feature file Just came across a typo in the user steps file. See merge request !3943
2016-05-04Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable
Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-03Remove go to dashboard test suite for group page and get rid of AR warningDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-28Merge branch 'project-webhooks-ui' into 'master' Jacob Schatz
Project webhooks updated UI Closes #13993 ![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png) ![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png) See merge request !3922
2016-04-28Merge branch 'project-deploy-keys-ui' into 'master' Jacob Schatz
Project deploy keys updated UI Closes #13992 See merge request !3912
2016-04-27Remove unused .contributed-projects classKarlo Soriano
While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector.
2016-04-27Fix typo in user steps featureKarlo Soriano
[ci skip]
2016-04-26Updated testsPhil Hughes
2016-04-26Fixed testsPhil Hughes
2016-04-25Updated tests for deploy keysPhil Hughes
2016-04-21Merge branch 'top-navigation-concept' into 'master' Dmitriy Zaporozhets
Implement top navigation for profile area Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block. I used profile area as a simplest way to implement and test this concept. Your feedback is welcome in comments For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3824
2016-04-21Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński
Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
2016-04-20Merge branch 'multi-filter-labels' into 'master' Jacob Schatz
Mutliple label filter Fixes #989 See merge request !3438
2016-04-20Merge branch 'license-templates-and-api-12804' into 'master' Robert Speicher
License templates when creating/editing a LICENSE file Closes #12804 See merge request !3660
2016-04-19Fix tests and remove countersDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-19Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski
# Conflicts: # db/schema.rb
2016-04-19Merge branch 'mr-formatting' into 'master' Robert Speicher
use ! rather than # for merge request references Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278 See merge request !3740
2016-04-19format merge request references properlyBen Bodenmiller
2016-04-18Fix specsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18Fix features specs (hopefully)Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18Fix testsKamil Trzcinski
2016-04-18Remove persistent XSS vulnerability in `commit_person_link` helperRobert Speicher
Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
2016-04-16Fixed testsPhil Hughes
2016-04-16Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski
# Conflicts: # db/schema.rb
2016-04-15Merge branch '14176-diff-paste-data' into 'master' Jacob Schatz
Copying and pasting doesn't grab line numbers or +/- Fixes #14176 See merge request !3687
2016-04-14Merge branch 'subscribe-button-fix' into 'master' Jacob Schatz
Removed references to subscribe-button CSS class These were being blocked by adblocks Closes #15043 See merge request !3677
2016-04-14Update click_diff_lineAnnabel Dunstone
2016-04-14fix failing testsArinde Eniola
2016-04-13Support skipped statusKamil Trzcinski
2016-04-13Load related MRs/branches asynchronouslyYorick Peterse
Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
2016-04-13Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski
2016-04-12Removed references to subscribe-button CSS classPhil Hughes
These were being blocked by adblocks Closes #15043
2016-04-12Fix rubocopKamil Trzcinski
2016-04-12Fix rest of rspec and spinach testsKamil Trzcinski
2016-04-12Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski
# Conflicts: # app/views/projects/commits/_commit.html.haml
2016-04-12Fix specsKamil Trzcinski
2016-04-11Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre