Commit Graph
1573 Commits
Author SHA1 Message Date
tiagonbotelho b9d13c11de implements upcoming filter in milstones 2016-03-12 18:08:01 +00:00
Douwe Maan 2b9b07891c Merge branch 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup'
# Conflicts:
#	app/helpers/application_helper.rb
2016-03-12 13:12:40 +01:00
Robert Speicher 444c6295ba Fix help_autocomplete alignment
OCD hooooooooo!

[ci skip]
2016-03-10 15:24:37 -05:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00
Robert Speicher 5c1dba671d Merge branch 'issue-mr-build-status-placement' into 'master'
Moves build status tooltip on issues

See merge request !3156
2016-03-10 18:52:33 +00:00
Phil Hughes 145143ac7f Changed named argument
Set position to auto left so that if it is off-screen it goes to the right
2016-03-10 18:05:55 +00:00
Phil Hughes a9ea06ed29 Fixed ruby style errors 2016-03-10 13:54:54 +00:00
Phil Hughes 5cdac7614d Started page two for labels dropdown to allow creating new labels 2016-03-10 13:54:54 +00:00
Phil Hughes 8ca880c3b8 Correctly fitlers remotely 2016-03-10 13:54:54 +00:00
Phil Hughes d6e5ed8a97 Extra links in label filter dropdown fotoer 2016-03-10 13:54:54 +00:00
Phil Hughes 11b52e287b Applied new dropdowns to issue filters 2016-03-10 13:54:54 +00:00
Phil Hughes cae03f8b2b Custom ID & toggle class on dropdown 2016-03-10 13:54:54 +00:00
Phil Hughes 4407532911 GitLab dropdown JS 2016-03-10 13:54:54 +00:00
Phil Hughes 2cd401676f Moves build status tooltip on issues 2016-03-10 13:17:35 +00:00
Douglas Barbosa Alexandre 00a19f323b Merge branch 'fix-todos' into 'master'
Fix error 500 in Todos

Closes #14095 

Closes #14075 

Closes #14109

Closes #14151

See merge request !3141
2016-03-09 19:22:43 +00:00
Douglas Barbosa Alexandre 7500a12aae Avoid error 500 when todo author was removed 2016-03-09 14:47:04 -03:00
Jacob Vosmaer 5e46662798 Merge branch 'commit-limits' into 'master'
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
2016-03-09 16:39:07 +00:00
Dmitriy Zaporozhets bc14d81af0 Merge branch 'rs-snippets-dont-expire' into 'master'
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
2016-03-09 09:02:17 +00:00
Dmitriy Zaporozhets c674ffe0e0 Merge branch 'improve-archived-projects' 2016-03-09 09:51:59 +01:00
Douwe Maan afb8d76f3c Merge branch 'cache-raw-2' into 'master'
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
2016-03-07 22:05:15 +00:00
Douwe Maan 903aa7c95e Merge branch 'issue_13621_2' into 'master'
Labels should be visible in dashboard and group milestone views

Closes #13621

See merge request !2931
2016-03-07 17:18:25 +00:00
Jacob Vosmaer a284d30783 Use Rails etag/cache_control helpers 2016-03-07 16:49:46 +01:00
Jacob Vosmaer 41bc9c463c Refactor caching code 2016-03-07 14:27:53 +01:00
Douwe Maan 99f08b3f72 Merge branch 'feature/cross-project-labels' into 'master'
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
2016-03-07 09:16:22 +00:00
Rubén Dávila 95b06a62c0 Updates from last code review. 2016-03-06 23:07:19 -05:00
Robert Speicher 836d593033 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.
2016-03-05 18:12:17 -05:00
Grzegorz Bizon b3f533c3a7 Escape project's name in cross project label 2016-03-05 16:01:05 +01:00
Dmitriy Zaporozhets 14df110b78 Merge branch 'issue-sidebar-mobile' into 'master'
Issue sidebar mobile

Fixes #13592 
Fixes #14037 

See merge request !3050
2016-03-05 11:48:21 +00:00
Robert Speicher 0c7626f3a5 Merge branch 'rs-frontmatter-pre' into 'master'
Properly display YAML front matter in Markdown

See merge request !3072
2016-03-05 00:17:58 +00:00
Dmitriy Zaporozhets 38984a59ac Show active sorting method for projects list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-04 19:27:02 +01:00
Dmitriy Zaporozhets bebf34aa47 Make projects sort dropdown shared so it can be reused for other pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-04 19:26:10 +01:00
Jacob Vosmaer 4cb3a4a73e Remove outdated comment 2016-03-04 15:47:11 +01:00
Jacob Vosmaer f943156b5e Put 'hidden commits' logic in CommitsHelper 2016-03-04 15:45:58 +01:00
Jacob Schatz cabd228f70 Fix bugs with open and close buttons 2016-03-04 09:06:57 -05:00
Jacob Schatz cabb61719d Open sidebar button on mobile. 2016-03-04 09:06:57 -05:00
Jacob Schatz d913febf0f Hide correct author info in header of issuable. 2016-03-04 09:06:57 -05:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Jacob Vosmaer fc90d9e589 Tell clients/proxies to cache raw blob requests 2016-03-03 17:59:47 +01:00
nico de ceulaer 3447ffbe9a ensure also alternative email addresses are used when looking up user 2016-03-03 14:50:21 +01:00
Grzegorz Bizon 34769efa79 Change content of cross project label 2016-03-03 10:41:11 +01:00
Grzegorz Bizon 62dcdef969 Improve cross project label look and feel 2016-03-03 10:41:11 +01:00
Grzegorz Bizon 7183a7da6d Add additional text prefix in cross project labels 2016-03-03 10:41:11 +01:00
Robert Speicher 74751791a8 Add a PreProcessPipeline 2016-03-02 22:19:36 -05:00
Phil Hughes 61c30061e7 audit log UI update
Closes #13862
2016-03-02 17:06:01 +00:00
Rubén Dávila 03d58f564c Little refactor for milestone_remaining_days helper from last code review. 2016-03-01 19:40:50 -05:00
Rubén Dávila 7773180219 Show days remaining instead of elapsed time for Milestone. 2016-03-01 19:40:50 -05:00
Jacob Schatz b2f0b3f145 Merge branch 'mr-prefix-activity-view' into 'master'
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
2016-03-01 14:02:43 +00:00
Douwe Maan fac1e0e83c Merge branch 'safe-content-type' into 'master'
Explain why we mangle blob content types

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079

See merge request !2956
2016-03-01 13:39:26 +00:00
Phil Hughes 8e8df6d562 Removed un-used variables 2016-03-01 13:03:39 +00:00
Phil Hughes fbe6b8eeca Replaced prefix with to_reference method calls 2016-03-01 13:03:39 +00:00