summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-1610-13/+130
|\ \ \ | |/ /
| * | Improving the original label-subscribing implementationRémy Coutable2016-03-151-0/+8
| | | | | | | | | | | | | | | | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
| * | Merge branch 'todos-title-attr' into 'master' Robert Speicher2016-03-153-5/+5
| |\ \ | | | | | | | | | | | | | | | | Set link title for todos. Closes #14042 See merge request !3161
| | * | Remove last to_referencetodos-title-attrJosh Frye2016-03-131-1/+1
| | | |
| | * | Escape!Josh Frye2016-03-112-5/+5
| | | |
| | * | Title attributes for activity feedJosh Frye2016-03-113-6/+6
| | | |
| | * | RubocopJosh Frye2016-03-101-1/+1
| | | |
| | * | Set link title for todos. Closes #14042Josh Frye2016-03-101-1/+1
| | |/
| * | Merge branch 'ci-fix-double-borders' into 'master' Robert Speicher2016-03-151-3/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double borders around the CI status Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14281 Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2760#note_4238291 See merge request !3224
| | * | Use klass instead of clazzci-fix-double-bordersKamil Trzcinski2016-03-151-3/+3
| | | |
| | * | Fix double borders around the CI statusKamil Trzcinski2016-03-151-3/+7
| | | |
| * | | Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' Douwe Maan2016-03-151-1/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes "iid of max iid" in Issuable sidebar for merged MR Fixes #13928. See merge request !3046
| | * | Fixes "iid of max iid" in Issuable sidebar for merged MRfix/13928-wrong-iid-of-max-iidRémy Coutable2016-03-081-1/+5
| | | | | | | | | | | | | | | | Fixes #13928
| * | | implements upcoming filter in milstonestiagonbotelho2016-03-121-0/+1
| | | |
| * | | Merge branch ↵Douwe Maan2016-03-121-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup' # Conflicts: # app/helpers/application_helper.rb
| | * | | ensure also alternative email addresses are used when looking up usernico de ceulaer2016-03-031-1/+1
| | | | |
| * | | | Fix help_autocomplete alignmentwebhooksRobert Speicher2016-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OCD hooooooooo! [ci skip]
| * | | | web hooks to webhooksashleys2016-03-101-1/+1
| | | | |
| * | | | Merge branch 'issue-mr-build-status-placement' into 'master' Robert Speicher2016-03-101-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Moves build status tooltip on issues See merge request !3156
| | * | | | Changed named argumentPhil Hughes2016-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Set position to auto left so that if it is off-screen it goes to the right
| | * | | | Moves build status tooltip on issuesPhil Hughes2016-03-101-2/+2
| | | |_|/ | | |/| |
| * | | | Fixed ruby style errorsPhil Hughes2016-03-101-30/+75
| | | | |
| * | | | Started page two for labels dropdown to allow creating new labelsPhil Hughes2016-03-101-1/+1
| | | | |
| * | | | Correctly fitlers remotelyPhil Hughes2016-03-101-1/+1
| | | | |
| * | | | Extra links in label filter dropdown fotoerPhil Hughes2016-03-101-2/+8
| | | | |
| * | | | Applied new dropdowns to issue filtersPhil Hughes2016-03-101-3/+5
| | | | |
| * | | | Custom ID & toggle class on dropdownPhil Hughes2016-03-101-2/+2
| | | | |
| * | | | GitLab dropdown JSPhil Hughes2016-03-101-0/+47
| |/ / /
* | | | Prevent projects to have higher visibility than groupsFelipe Artur2016-03-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Prevent Groups to have smaller visibility than projects Add default_group_visibility_level to configuration Code improvements
* | | | Add visibility level icon and a couple of specsFelipe Artur2016-03-101-1/+5
| | | |
* | | | Code improvementsFelipe Artur2016-03-101-1/+1
| | | |
* | | | Add permission level to groupsFelipe Artur2016-03-102-0/+17
|/ / /
* | | Merge branch 'fix-todos' into 'master' Douglas Barbosa Alexandre2016-03-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 in Todos Closes #14095 Closes #14075 Closes #14109 Closes #14151 See merge request !3141
| * | | Avoid error 500 when todo author was removedDouglas Barbosa Alexandre2016-03-091-1/+1
| | | |
* | | | Merge branch 'commit-limits' into 'master' Jacob Vosmaer2016-03-091-0/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit limits Prevent timeouts when creating/viewing Merge Requests with many commits. Also, reduce the number of commits shown in the UI from 500 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14031 This MR avoids Unicorn timeouts in some places and takes 4.5 seconds off load times in others, when manually testing with a 4500-commit compare/MR in the linux repo. It does not limit the number of Commit objects instantiated in memory, just the amount of HTML generated. It seems that having 4500 commits objects is not a problem in itself. If it ever becomes one we could do something for Commit objects like we did for Diff (introduce a CommitCollection or something). See merge request !3095
| * | | Remove outdated commentJacob Vosmaer2016-03-041-1/+0
| | | |
| * | | Put 'hidden commits' logic in CommitsHelperJacob Vosmaer2016-03-041-0/+12
| | | |
* | | | Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-091-10/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `Snippet#expires_at` This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years. See merge request !3103
| * | | | Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-051-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years.
* | | | | Merge branch 'improve-archived-projects'Dmitriy Zaporozhets2016-03-092-10/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Show active sorting method for projects listDmitriy Zaporozhets2016-03-041-0/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Make projects sort dropdown shared so it can be reused for other pagesDmitriy Zaporozhets2016-03-041-10/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-071-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set cache headers for raw blobs This changes allows browsers and (in the case of public projects) proxy caches to cache raw Git blob responses. See merge request !3113
| * | | | Use Rails etag/cache_control helperscache-raw-2Jacob Vosmaer2016-03-071-11/+4
| | | | |
| * | | | Refactor caching codeJacob Vosmaer2016-03-071-7/+10
| | | | |
| * | | | Tell clients/proxies to cache raw blob requestsJacob Vosmaer2016-03-031-0/+25
| | | | |
* | | | | Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-071-0/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in dashboard and group milestone views Closes #13621 See merge request !2931
| * | | | | Updates from last code review.issue_13621_2Rubén Dávila2016-03-061-0/+26
| | |/ / / | |/| | |
* | | | | Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-071-4/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for cross project references for labels ## Summary Support for cross project references for labels. ## Rationale 1. Cross project label references are currently not supported in GitLab 1. `to_reference` method signature in `Label` model breaks the abstraction introduced in `Referable`. `concerns/referable.rb: def to_reference(_from_project = nil)` Signatures: ``` label.rb: def to_reference(format = :id) commit_range.rb: def to_reference(from_project = nil) commit.rb: def to_reference(from_project = nil) external_issue.rb: def to_reference(_from_project = nil) group.rb: def to_reference(_from_project = nil) issue.rb: def to_reference(from_project = nil) merge_request.rb: def to_reference(from_project = nil) milestone.rb: def to_reference(from_project = nil) project.rb: def to_reference(_from_project = nil) snippet.rb: def to_reference(from_project = nil) user.rb: def to_reference(_from_project = nil) ``` This MR suggests using `def to_reference(from_project = nil, format: :id)` which makes use of keyword arguments and preserves abstract interface. 1. We need support for cross project label references when we want to move issue to another project It may happen that issue description, system notes or comments contain reference to label and this reference will be invalid after moving issue to another project and will not be displayed correctly unless we have support for cross project references. Merge request that needs this feature: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2831 I think that cross project label references may be useful, (example: `Hey, see our issues for CI in GitLab CE! - gitab-org/gitlab-ce~"CI"`). cc @JobV @DouweM @rspeicher See merge request !2966
| * | | | Escape project's name in cross project labelfeature/cross-project-labelsGrzegorz Bizon2016-03-051-1/+1
| | | | |
View Lorry Controller Status