summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
| | | |
| * | | Change content of cross project labelGrzegorz Bizon2016-03-031-2/+2
| | | |
| * | | Improve cross project label look and feelGrzegorz Bizon2016-03-031-5/+6
| | | |
| * | | Add additional text prefix in cross project labelsGrzegorz Bizon2016-03-031-3/+9
| | |/ | |/|
* | | Merge branch 'issue-sidebar-mobile' into 'master' Dmitriy Zaporozhets2016-03-051-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue sidebar mobile Fixes #13592 Fixes #14037 See merge request !3050
| * | | Fix bugs with open and close buttonsJacob Schatz2016-03-041-1/+1
| | | |
| * | | Open sidebar button on mobile.Jacob Schatz2016-03-041-1/+1
| | | |
| * | | Hide correct author info in header of issuable.Jacob Schatz2016-03-041-2/+6
| | |/ | |/|
* | | Merge branch 'rs-frontmatter-pre' into 'master' Robert Speicher2016-03-051-0/+2
|\ \ \ | |/ / |/| | | | | | | | Properly display YAML front matter in Markdown See merge request !3072
| * | Add a PreProcessPipelineRobert Speicher2016-03-021-0/+2
| |/
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-27/+7
|/
* audit log UI updatePhil Hughes2016-03-021-1/+10
| | | | Closes #13862
* Little refactor for milestone_remaining_days helper from last code review.issue_13623Rubén Dávila2016-03-011-4/+3
|
* Show days remaining instead of elapsed time for Milestone.Rubén Dávila2016-03-011-0/+11
|
* Merge branch 'mr-prefix-activity-view' into 'master' Jacob Schatz2016-03-011-2/+2
|\ | | | | | | | | | | | | | | | | Changed # to ! on merge requests on activity view Closes #9082 ![Screen_Shot_2016-02-23_at_11.59.55](/uploads/87b859ae63282ae24025168404beb158/Screen_Shot_2016-02-23_at_11.59.55.png) See merge request !2938
| * Removed un-used variablesPhil Hughes2016-03-011-2/+0
| |
| * Replaced prefix with to_reference method callsPhil Hughes2016-03-011-8/+3
| |
| * Changed # to ! on merge requests on activity viewPhil Hughes2016-03-011-2/+9
| | | | | | | | Closes #9082
* | Merge branch 'safe-content-type' into 'master' Douwe Maan2016-03-011-0/+18
|\ \ | |/ |/| | | | | | | | | Explain why we mangle blob content types Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079 See merge request !2956
| * Explain why we mangle blob content typessafe-content-typeJacob Vosmaer2016-02-241-0/+18
| |
* | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-261-8/+20
| | | | | | | | | | The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
* | Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-specRobert Speicher2016-02-241-0/+4
|/ | | | | | | | We were doing all kinds of code gymnastics to "enable" Crowd in the feature spec and this would sometimes cause a transient failure. Really what it's testing is if the Crowd login form shows when Crowd's enabled, so this is much better suited to a view spec.
* Merge branch 'fix-moving-revert-button' into 'master' Jacob Schatz2016-02-221-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Fixed revert button tooltip placement causing movement Before: ![moving-tooltip](/uploads/65cb9a41e8b8114fd8ee10d68cfd8206/moving-tooltip.gif) After: ![moving-tooltip](/uploads/a1c36eb5735dc7592c49f6b5cb1469b5/moving-tooltip.gif) See merge request !2910
| * Fixed revert button tooltip placement causing movementfix-moving-revert-buttonPhil Hughes2016-02-221-2/+2
| |
* | Merge branch 'issue_13463' into 'master' Jacob Schatz2016-02-222-1/+2
|\ \ | |/ |/| | | | | | | | | Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880
| * Fixes syntax errorAlfredo Sumaran2016-02-191-1/+1
| |
| * Make diff view name getter less error proneAlfredo Sumaran2016-02-191-1/+1
| |