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-03-18Restrict access to references for confidential issuesDouglas Barbosa Alexandre
2016-03-17Merge branch '4009-external-users' into 'master' Douwe Maan
External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
2016-03-16Merge branch 'fix-capybara-deprecation-warnings' into 'master' Robert Speicher
Fix Capybara 2.6.2 deprecation warnings See merge request !3236
2016-03-15Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg
2016-03-15Fix Capybara 2.6.2 deprecation warningsStan Hu
2016-03-15Original implementation to allow users to subscribe to labelsTimothy Andrew
1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
2016-03-13External UsersZeger-Jan van de Weg
The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
2016-03-10Removed benchmark suite and its documentationYorick Peterse
The rationale for this can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/13718 but in short the benchmark suite no longer serves a good purpose now that we have proper production monitoring in place. Fixes gitlab-org/gitlab-ce#13718
2016-02-25Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' Jacob Schatz
Sidebar overlaps content when screen is below 1200px. When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717 ![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif) ![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif) Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620
2016-02-23Set window_size to 1366*768Alfredo Sumaran
2016-02-17Add newlineJacob Vosmaer
2016-02-17Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer
git-archive-refactor
2016-02-16Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan
Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - **What does this MR do?** Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) **Are there points in the code the reviewer needs to double check?** 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 **Why was this MR needed?** More information about user for push events, and more data about repositiry ( project ) **What are the relevant issue numbers?** No **Screenshots (if relevant)** No See merge request !2788
2016-02-11Fix APIJacob Vosmaer
2016-02-11Add new data to project in push, issue, merge-request and note webhooks dataKirill Zaitsev
- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
2016-02-09Validate email addresses using Devise.email_regexpRémy Coutable
Also: - Get rid of legacy :strict_mode - Get rid of custom :email validator - Add some shared examples to spec emails validation
2016-01-30Increase the minimum length for commit SHA matching to 7Robert Speicher
This is the git default and will help to prevent false positive matches. Closes #12706
2016-01-29Prevent transient Capybara timeouts during feature testsRobert Speicher
The problem occurred because asset compilation takes a long time, so when the asset cache didn't exist and the first test ran, it would often (randomly) time out during the generation before the actual test even had a chance to run. Now we check if the cache exists before the suite runs, and if not, we manually fire a request to the root URL in order to generate it. This should allow subsequent tests to use the cached assets.
2016-01-14Let the CI runner know about builds that this build depends onKamil Trzcinski
This allows us to implement artifacts passing: runner will download artifacts from all prior builds
2016-01-14Merge branch 'add-pagination-headers-to-api' into 'master' Dmitriy Zaporozhets
Add pagination headers to already paginated API resources Following #3045, I've added pagination headers using already available Kaminari methods. ## Pagination headers in action ![Screen_Shot_2016-01-14_at_12.14.53](/uploads/88807f754dd9aafbb24da85f6bdf9521/Screen_Shot_2016-01-14_at_12.14.53.png) --- I've also added a shared example to test paginated API resources. A possible next step would be to paginate all the API resources that return an array. See merge request !2426
2016-01-14Fix parse_gollum_tags matcherDouglas Barbosa Alexandre
2016-01-14Add tests for the wiki pipelineDouglas Barbosa Alexandre
2016-01-14Add pagination headers to already paginated API resourcesRémy Coutable
2015-12-24Render milestone links as referencesDouwe Maan
2015-12-18Backport JIRA serviceDrew Blessing
2015-12-16Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets
2015-12-15Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan
2015-12-15Fixed Rubocop offensesGabriel Mazetto
2015-12-14Merge branch 'master' into ux/suppress-ci-yml-warningGrzegorz Bizon
* master: (24 commits) Fix runners admin view Fix migrations Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git Fix last specs Fix specs Fix after column rename Fix errors Update badge Finishing touches Fix triggers tests Rename columns and rename migrations Reimplement Trigger API Remove ci_ prefix from all ci related things Add runners token Migrate CI::Project to Project Fix indentation and BuildsEmailService Change default values Enhance migrate CI emails Fix issue tracker service ... Conflicts: spec/features/commits_spec.rb
2015-12-14Improve gitlab ci commits specs (refactoring)Grzegorz Bizon
This minimizes usage of instance variables in this spec, and changes double quotation marks to single when string interpolation is not being used.
2015-12-11Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan
Enable rubocop metrics This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased. See merge request !1802
2015-12-08Merge branch 'serve_lfs_object' into 'master' Douwe Maan
Serve LFS object Depends on gitlab-org/gitlab_git!57 See merge request !1976
2015-12-08Fix specs caused by update of gitlab-test repo.Marin Jankovski
2015-12-08Move `common_mentionable_setup` to shared context in specsGrzegorz Bizon
2015-12-08Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre
2015-12-08Fix random failing test - delete attachmentDmitriy Zaporozhets
Make sure we wait for AJAX request to finish before end test and cleanup database Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-07Merge branch 'master' into fix-merge-request-that-removes-submoduleDouglas Barbosa Alexandre
2015-12-07Add specs for showing lfs object in UI.Marin Jankovski
2015-12-04Fix 500 error when creating a merge request that removes a submoduleDouglas Barbosa Alexandre
2015-12-03Use URL helpers in specsDouwe Maan
2015-12-01Add new references to markdown feature spec.Douwe Maan
2015-12-01Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan
2015-12-01Fix specsDouwe Maan
2015-11-04Replace all usages of `git` command with configurable binary pathRobert Speicher
Closes #3311
2015-10-16Merge branch 'master' into rs-redactor-filterDouwe Maan
2015-10-15Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets
Fix error preventing displaying of commit data for a directory with a leading dot Directories with leading dots erroneously get rejected by the route controller if git ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller. Closes https://github.com/gitlabhq/gitlabhq/issues/8763 See merge request !1574
2015-10-15Merge branch 'master' into rs-redactor-filterDouwe Maan
2015-10-14Merge branch 'simplify-cross-references' into 'master' Robert Speicher
Simplify code around (cross)-references See merge request !1568
2015-10-14Make Mentionable#cross_reference_exists? private.Douwe Maan
2015-10-13Fix error preventing displaying of commit data for a directory with a ↵Stan Hu
leading dot Closes https://github.com/gitlabhq/gitlabhq/issues/8763