summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-1013-50/+90
|\ | | | | | | | | | | | | Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
| * Cleanup to use one selectorfix-explore-filterJosh Frye2016-02-095-8/+8
| |
| * More specific selectorsJosh Frye2016-02-091-4/+4
| |
| * MR feedbackJosh Frye2016-02-095-12/+9
| |
| * Extract events rendering to own action.Josh Frye2016-02-095-17/+21
| |
| * Starred, All, and Trending on explore are paged also group projects. Need ↵Josh Frye2016-02-097-14/+55
| | | | | | | | ajax filter.
| * JS FixesJosh Frye2016-02-092-14/+15
| |
| * Fix explore filter. Fixes #13182Josh Frye2016-02-093-24/+21
| |
* | Ensure link for README blobs includes the full pathrs-issue-13254Robert Speicher2016-02-091-1/+1
| | | | | | | | Closes #13254
* | Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-091-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
| * | Add information about expose of build variables.variables-build-logKamil Trzcinski2016-02-091-1/+3
| | |
* | | Merge branch 'fix-logo-rasterization' into 'master' Robert Speicher2016-02-092-21/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent rasterization artifacts in the logo, and simplify markup. - Remove sketch-namespaced attributes. - Remove unused groups, and cancel out unnecessary transforms. - Use overlap to avoid rasterization artifacts in the logo. - Remove viewBox parameter and define paths in their final form. See merge request !2741
| * | | Prevent rasterization artefacts in the logo, and simplify markup.Aaron Hamilton2016-02-082-21/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | - Remove sketch-namespaced attributes. - Remove unused groups, and cancel out unnecessary transforms. - Use overlap to avoid rasterization artefacts in the logo. - Extend comment for `#logo` click event handler, as it's a non-obvious hack for Safari. - Remove viewBox parameter and define paths in their final form.
* | | Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' Douwe Maan2016-02-092-13/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smarter flushing of branch statistics caches This basically ensures we only flush caches of branches whenever we really have to. See commit c514f8b850219cd3e5526e73e1d00e6729e2b466 for the details. cc @joshfng @rspeicher See merge request !2769
| * | | Smarter flushing of branch statistics cachesYorick Peterse2016-02-092-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of flushing the behind/ahead counts for all branches upon every push we now only flush the cache of branches that actually need to have these statistics recalculated. There are now basically 2 scenarios and their effects: 1. A user pushes a commit to the default branch, this results in the cache being flushed for all branches. 2. A user pushes to a non default branch, this results in _only_ the cache for that branch being flushed. The existing code (Repository#expire_cache) remains backwards compatible with the previous behaviour, the new behaviour is only applied when a branch name is passed as an argument. This ensures that when for example a project is deleted the cache for all branches is flushed.
* | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-0918-114/+93
|\ \ \ \
| * \ \ \ Merge branch 'ci-permissions' into 'master' Robert Speicher2016-02-0818-114/+93
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
| | * | | Remove current_user && when can? is usedKamil Trzcinski2016-02-052-2/+2
| | | | |
| | * | | Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-0565-338/+736
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | | Use `delete` instead of assignment operator when filtering build abilitiesKamil Trzcinski2016-02-041-1/+1
| | | | | |
| | * | | | Update ability model after commentsKamil Trzcinski2016-02-041-24/+15
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-0462-316/+521
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml
| | * | | | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-043-10/+10
| | | | | | |
| | * | | | | Simplify abilitiesKamil Trzcinski2016-02-041-16/+23
| | | | | | |
| | * | | | | Properly handle commit status permissions (for a build)Kamil Trzcinski2016-02-032-4/+26
| | | | | | |
| | * | | | | Fix build errorsKamil Trzcinski2016-02-032-4/+8
| | | | | | |
| | * | | | | Clean Ci::ApplicationController from unused permission related codeKamil Trzcinski2016-02-032-50/+2
| | | | | | |
| | * | | | | Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-023-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
| | * | | | | Make the CI permission model simplerKamil Trzcinski2016-02-0215-52/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* | | | | | | Merge branch 'fix/max-attachment-size-setting-validation'Douwe Maan2016-02-091-0/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Validate maximum attachment size in application settingsGrzegorz Bizon2016-02-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `max_attachment_size` in `ApplicationSetting` should be present, only integers greater than zero are valid. Closes #13188
* | | | | | | Merge branch ↵Douwe Maan2016-02-096-0/+21
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' Add option to include the sender name in body of Notify email _Originally opened at !2495 by @huacnlee._ - - - Fixes #7824. See merge request !2767
| * | | | | | Add option to include the sender name in body of Notify email. fix #7824huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mailJason Lee2016-02-096-0/+21
| | | | | | |
* | | | | | | Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project'Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Validate uniqueness of milestone title per projectZeger-Jan van de Weg2016-02-081-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Fixes #3903
* | | | | | | Merge branch 'add-tooltip-to-stuck-builds' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a tooltip to the stuck warning build symbol We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 See merge request !2680
| * | | | | | Add a tooltip to the stuck warning build symbolJeroen van Baarsen2016-02-081-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-097-16/+47
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
| * | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-067-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | Closes #11853
* | | | | | Merge branch 'increase_import_timeout' into 'master' Douwe Maan2016-02-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase project import timeout from 4 minutes to 15 minutes Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246 ## Import screenshot ![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png) See merge request !2717
| * | | | | | Increase project import timeout from 4 minutes to 15 minutesDrew Blessing2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many users were experiencing timeouts when we only allowed 4 minutes before a timeout. A 15 minute timeout is more than reasonable and prevents us from having to add a configuration for this. Fixes gitlab-org/gitlab-ee#246
* | | | | | | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-092-23/+27
|\ \ \ \ \ \ \
| * | | | | | | Faster snippet searchValery Sizov2016-02-052-23/+27
| | | | | | | |
* | | | | | | | Merge branch 'caching-repository-git-operations' into 'master' Yorick Peterse2016-02-093-3/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | See merge request !2752
| * | | | | | | | Cache various Repository Git operationscaching-repository-git-operationsYorick Peterse2016-02-083-3/+25
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caches the output of the following methods: * Repository#empty? * Repository#has_visible_content? * Repository#root_ref The cache for Repository#has_visible_content? is flushed whenever a commit is pushed to a new branch or an existing branch is removed. The cache for Repository#root_ref is only flushed whenever a user changes the default branch of a project. The cache for Repository#empty? is never explicitly flushed as there's no need for it.
* | | | | | | | Merge branch 'kkm/gitlab-ce-user-diff-view-pref-cookie' into 'master' Rémy Coutable2016-02-083-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember user's inline/tabular diff view preference in a cookie _Originally opened at !1677 by @kkm._ --- As per #3071, some users (we have a local EE installation) prefer 2-column view in diff. In this MR I add an implementation for this feature, using a cookie. Fixes #3071. See merge request !2723
| * | | | | | | Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-051-3/+1
| | | | | | | |
| * | | | | | | Remember user's inline/tabular diff view preference in a cookiekkm2016-02-053-0/+11
| | | | | | | |
* | | | | | | | Merge branch 'project-title-dropdown-toggle-button' into 'master' Jacob Schatz2016-02-052-2/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the project switcher dropdown toggle Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214 cc. @jschatz1 @dzaporozhets See merge request !2733
| * | | | | | | | Uses icon helper for dropdown toggle iconPhil Hughes2016-02-051-1/+1
| | | | | | | | |