Commit Graph
401 Commits
Author SHA1 Message Date
Annabel Dunstone a9dd1beea4 Remove div between ul and li 2016-06-13 14:30:40 -05:00
Kamil Trzciński c928accd95 Merge branch 'fix-related-branches-error-500' into 'master'
Fix typo causing related branches to Error 500

From Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/6154/

See merge request !4611
2016-06-13 16:22:38 +00:00
Rémy Coutable 65df6bcb89 Merge branch '18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twice' into 'master'
Resolve ""When this merge request is accepted, this issue will be closed automatically" rendered twice"

## What does this MR do?

1. Only show the above text when there is an MR that will close the issue, and even then, only show it once.
2. Apply 98f147e84d2bd8f2278452ac0852118452c76d4a to a bunch of other places that need it.

## Are there points in the code the reviewer needs to double check?

¯\_(ツ)_/¯

## Why was this MR needed?

Some pages were broken.

## What are the relevant issue numbers?

Fixes #18446.

## Screenshots (if relevant)

Before:
![image](/uploads/23cfaf95b7c798f22963ff67f78a803b/image.png)

After:
![image](/uploads/ca9c538069ba52e53858c69387738521/image.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4594
2016-06-13 08:47:10 +00:00
Stan Hu c1f37964ed Fix typo causing related branches to Error 500 2016-06-12 19:29:58 -07:00
Dmitriy Zaporozhets 95f15b14d1 Render issues link on issues subnav unless you visit merge request controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-10 19:15:23 +03:00
Dmitriy Zaporozhets d4b2f5d0f3 Render only issues/mr in subnav depends on context
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-10 19:15:23 +03:00
Dmitriy Zaporozhets 1976a44649 Move Labels and Milestones as sub tab to Issues/MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-10 19:15:23 +03:00
Sean McGivern c7941acd1e Don't try to count a relation with aliases
98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML,
but not MRs or Atom feeds.
2016-06-10 14:29:08 +01:00
Sean McGivern 49c06ba391 Only show issues closing MR when present 2016-06-10 14:17:10 +01:00
Jacob Schatz ae126c5599 Merge branch '17562-filter-issues-is-only-visible-when-user-is-logged-in' into 'master'
#17562 Fixes issues list filter only visible when user is logged in

## What does this MR do?

1. Moves the issue/MR list search form out of the `if current_user` conditional, allowing guests to view the field.

2.  Adds some margin to the search form, this is because in mobile view for guest users, the field was not supported by the RSS button and the New Issue button and would drop to meet the list.

## Are there points in the code the reviewer needs to double check?

Are there any views where the `margin-bottom: 12px` will affect the styling?

## Why was this MR needed?

Guest user UX. Nothing feels better than increasing intangible value!

## What are the relevant issue numbers?

Fixes #17562.

## Screenshots (if relevant)

![Screen_Shot_2016-05-16_at_23.48.06](/uploads/cf0f0c48287517ac3e83b204b4ee09b2/Screen_Shot_2016-05-16_at_23.48.06.png)

/cc @jschatz1 

**UPDATE:**

![Screen_Shot_2016-05-20_at_16.13.22](/uploads/eb854838a514d0d54d0f13bde1636b8a/Screen_Shot_2016-05-20_at_16.13.22.png)

See merge request !4171
2016-06-09 18:43:58 +00:00
Dmitriy Zaporozhets 1dc001730b Cleanup and imrpove issue/mr buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 17:20:07 +03:00
Dmitriy Zaporozhets e533890bf1 Improve button color for issue and mr pages
* make sidebar button white
* make header button gray if not primary

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08 16:38:18 +03:00
Luke BennettandLuke "Jared" Bennett 200bbbcb6a Fixes issue search form hiding when current_user is nil (guest user)
Fixes the bottom margin of .nav-controls > form (issues list search/filter form) so when a guest views on the field on mobile it is not squished against the issues list

Updated CHANGELOG

navigation tabs and navigation filter search will now stay on the same row until there is no space to

Removed unneeded media queries
2016-06-07 22:37:28 +01:00
Kamil Trzcinski 4e38d88df5 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 2016-06-06 20:24:21 +02:00
Kamil Trzcinski 7ad7e10fee Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-06 11:20:17 +02:00
Fatih AcetandZ.J. van de Weg f1d74ccc8c Some design related tweaks. 2016-06-06 11:10:10 +02:00
Alfredo Sumaran 22b8b9a7f3 Address feedback 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 151158f1d7 Expose Issue ID 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 4ab6bfcef5 Set indeterminated items 2016-06-03 17:10:20 -05:00
Kamil Trzcinski bf2bd2373d Fix merge_request handling 2016-06-03 15:58:37 +02:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Kamil Trzcinski 08baa9983e Use pipelines in context of Project 2016-06-03 13:34:03 +02:00
Douwe Maan 2d084dd848 Merge branch 'separate-banzai-references' into 'master'
Separate reference gathering from rendering

This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.

cc @rspeicher @DouweM 

See merge request !3969
2016-06-01 15:51:59 +00:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Dmitriy Zaporozhets cdcb354f17 Remove header title from project pages
With new navigation design it makes no sense to duplicate title in the
header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-26 17:58:44 +02:00
Yorick Peterse 25c08d11bb Added author to various Markdown calls in views
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
2016-05-26 17:14:06 +02:00
Jacob Schatz 44cc765a8c Merge branch 'link-to-in-issues-index' into 'master'
Replace `link_to_gfm` with `link_to` in merge request and issue titles.

## What does this MR do?
This removed GitLab Markdown Formatting from issue titles due to issues and confusion it caused as well as performance reasons.

On the issue/MR page itself, the formatting is preserved. This only effects index pages. See:

![Screen_Shot_2016-05-24_at_3.31.17_PM](/uploads/8857ed7f3cc6a47ea41ca88134e5d17a/Screen_Shot_2016-05-24_at_3.31.17_PM.png)

I think the trade-off here is worth it, otherwise we'd just be playing wack-a-mole.

## Are there points in the code the reviewer needs to double check?
I don't think so.

## Why was this MR needed?
Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused a number of users, so it’s removed.

This is also ever so slightly more performant :)

## What are the relevant issue numbers?
This fixes #17614 and #17230.

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-05-24_at_3.19.52_PM](/uploads/25313af3d3995a096b7bad7c5a26d071/Screen_Shot_2016-05-24_at_3.19.52_PM.png)

After:

![Screen_Shot_2016-05-24_at_3.20.13_PM](/uploads/f14f09918001bcbac2cd939b016479b2/Screen_Shot_2016-05-24_at_3.20.13_PM.png)

Before:

![Screen_Shot_2016-05-24_at_3.20.48_PM](/uploads/c183ae2c491650c328eb5768f6a55fd9/Screen_Shot_2016-05-24_at_3.20.48_PM.png)

After:

![Screen_Shot_2016-05-24_at_3.20.42_PM](/uploads/d3431a691768bae2c5244b9b632061b9/Screen_Shot_2016-05-24_at_3.20.42_PM.png)

cc: @rspeicher @jschatz1 

See merge request !4284
2016-05-26 14:46:39 +00:00
Douwe Maan f96127bc2c Merge branch 'rs-remove-issue_to_atom' into 'master'
Remove `issue_to_atom` helper



See merge request !4265
2016-05-25 20:51:53 +00:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00
Connor Shea 77a1565c80 Replace link_to_gfm with link_to in merge request and issue titles.
Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused some users, so it’s removed.

On the issue/MR page itself, the formatting is preserved. This only effects index pages.

This is also ever so slightly more performant :)

This fixes #17614 and #17230.
2016-05-24 15:24:11 -06:00
Robert Speicher 7001842dc4 Remove issue_to_atom helper 2016-05-23 17:06:26 -04:00
Phil Hughes e76d11dce9 Related merge request text alignment 2016-05-23 14:58:48 +01:00
Kamil Trzcinski ecee057795 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-13 17:15:09 -05:00
Zeger-Jan van de Weg 4558b5b9fe Incorporate feedback 2016-05-11 22:43:58 +02:00
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
Kamil Trzcinski 7c1acb022a Merge remote-tracking branch 'origin/master' into with-pipeline-view
# Conflicts:
#	app/views/projects/ci/builds/_build.html.haml
#	app/views/projects/commit/_ci_commit.html.haml
#	app/views/projects/commit/_commit_box.html.haml
2016-05-09 23:53:02 +03:00
Rémy Coutable f5240f9703 Expose MergeRequest#user_notes_count in the API and use the method in issues list
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-09 16:08:07 +02:00
Zeger-Jan van de Weg 3bdc57f0a7 Create table for award emoji 2016-05-06 10:47:11 +02:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
2016-04-28 16:13:48 -04:00
Kamil Trzcinski cb90368a69 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-04-26 16:36:17 +02:00
Yorick Peterse d35dde0129 Merge branch 'remove-update-files' into 'master'
Removed JS update templates

See merge request !3814
2016-04-21 22:23:41 +00:00
Kamil Trzciński d240666800 Merge branch 'ci-commit-as-pipeline' into 'master'
Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob

ci_commits -> pipelines
ci_builds -> jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653
2016-04-21 08:10:37 +00:00
Mehmet BeydoganandRobert Speicher c6be4ec544 Add red color to overdue and open issues 2016-04-20 15:42:09 -04:00
Mehmet BeydoganandRobert Speicher 3afd08170d Add due_date:time field to Issue model
Add due_date text field to sidebar issue#show
Add ability sorting issues by due date ASC and DESC
Add ability to filtering issues by No Due Date, Any Due Date, Due to tomorrow, Due in this week options
Add handling issue due_date field for MergeRequest
Update CHANGELOG
Fix ambigous match for issues#show sidebar
Fix SCREAMING_SNAKE_CASE offenses for due date contants
Add specs for due date sorting and filtering on issues
2016-04-20 15:42:09 -04:00
Kamil Trzcinski 27e0c7723c Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
# Conflicts:
#	db/schema.rb
2016-04-19 14:00:14 -04:00
Phil Hughes 136887da4b Removed JS update templates 2016-04-19 10:54:27 +01:00
Phil Hughes c24640c721 Fixed issue with tasklist toggling sidebar refresh
Closes #15270
2016-04-18 11:06:30 +01:00
Phil HughesandJacob Schatz 84fba4d162 Updated some if statements 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz 2629ab4472 Fixed tests 2016-04-16 16:13:16 -04:00
Phil HughesandJacob Schatz 4b15a8ed26 Fixed up based on feedback 2016-04-16 16:13:16 -04:00