00e3c2e00f
Fix replace label references with links for group labels
2016-10-19 14:58:25 -02:00
1fd8470087
Hide prioritized labels only when no labels are available to project
2016-10-19 14:58:25 -02:00
11d786e7da
Use try instead of ternary operator on Gitlab::ImportExport::ProjectTreeRestorer
2016-10-19 14:58:25 -02:00
9629bb962c
Add column type to labels and do the batch update in the same migration
2016-10-19 14:58:25 -02:00
7e11ca86fd
Reuse LabelsFinder on Issueable#add_labels_by_names
2016-10-19 14:58:25 -02:00
3db2261005
Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilter
2016-10-19 14:58:25 -02:00
723e576782
fix rubocop warning
2016-10-19 14:58:25 -02:00
77b7bfd463
Fix import/export labels to cope with project and group labels. Added relevant specs.
2016-10-19 14:58:25 -02:00
848a146fc3
Fix import test
2016-10-19 14:58:25 -02:00
0bfa39d5bd
Remove scopes/types for labels
2016-10-19 14:58:25 -02:00
07709c5576
Unfold references for group labels when moving issue to another project
2016-10-19 14:58:25 -02:00
484f19ed1c
Include global labels when moving an issue to another project
2016-10-19 14:58:25 -02:00
fd0ba37276
Update project test file for project import integration test
2016-10-19 14:58:25 -02:00
e036a72dca
Add Lavel#type to methods in lib/gitlab/import_export/import_export.yml
2016-10-19 14:58:25 -02:00
1644276bac
Add tests to LabelsFinder
2016-10-19 14:58:25 -02:00
e00c739f97
Add Label attributes: type, and group_id to safe model attributes
2016-10-19 14:58:25 -02:00
20b6974a5c
Fix Issuable#add_labels_by_names to validate if label exists on group
2016-10-19 14:58:24 -02:00
b654229dcd
Fix LabelsHelper#link_to_label to use the subject argument
2016-10-19 14:58:24 -02:00
ae88126d13
Show labels widget on issuable sidebar if project has only group labels
2016-10-19 14:58:24 -02:00
8522ef44bf
Recreates missing group labels when moving project to another group
2016-10-19 14:58:24 -02:00
e28058c410
Validate if project label title does not exist at group level
2016-10-19 14:58:24 -02:00
cfedd42bad
Add ProjectLabel model
2016-10-19 14:58:24 -02:00
e2dd75c0a2
Makes the query to retrieve group labels more simpler
2016-10-19 14:58:24 -02:00
32c663ff24
Use policies to handle with global/project label permissions
2016-10-19 14:58:24 -02:00
701544fb48
Hides project/group labels section if there are none
2016-10-19 14:58:24 -02:00
2910896b53
Remove duplication between global and the regular label partials
2016-10-19 14:58:24 -02:00
1c73d302e2
Avoid an extra a query per label when setting label priority
2016-10-19 14:58:24 -02:00
b10e5764ac
List only labels that belongs to the group on the group issues page
2016-10-19 14:58:24 -02:00
baf47a0bd0
Remove project_labels from Projects::ApplicationController
2016-10-19 14:58:24 -02:00
cf14482a5a
LabelsFinder inherits from UnionFinder
2016-10-19 14:58:24 -02:00
476c26deb2
Replace label references with links for group labels
2016-10-19 14:58:24 -02:00
7f2e29ff3d
Remove unused method LabelsHelper#project_label_names
2016-10-19 14:58:24 -02:00
9463551ece
Validates uniqueness of title unless label is a template
2016-10-19 14:58:24 -02:00
bdb7bf4b51
List group labels on project labels page
2016-10-19 14:58:24 -02:00
bf9d928b45
Allow user to create a board list based on a group label
2016-10-19 14:58:24 -02:00
398ab263fd
Allow users to apply group labels on Issues/MRs
2016-10-19 14:58:24 -02:00
d5a595b597
Add LabelsFinder
2016-10-19 14:57:15 -02:00
52e0c3b565
Add CRUD for Group Labels
2016-10-19 14:57:15 -02:00
d820c090ec
Add GroupLabel model
2016-10-19 14:57:14 -02:00
6d709417ea
Merge branch 'dont-touch-fs-on-pipeline-save' into 'master'
...
Keep around commits only on pipeline create
## What does this MR do?
Since the pipeline SHA doesn't change, we don't need to update keep arounds every save.
## Why was this MR needed?
This is minimal change to fix this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23503
See merge request !6986
2016-10-19 16:55:28 +00:00
257c58ebeb
Set webkit-overflow-scrolling to auto for children of body.
2016-10-19 18:22:12 +02:00
d927336403
Merge branch '21444-pipeliens-new-mr' into 'master'
...
Add pipelines tab to new MR
#### What does this MR do?
Adds pipelines tab to new MRs
#### Screenshots (if relevant)
#### What are the relevant issue numbers?
Closes #21444
See merge request !6238
2016-10-19 16:14:46 +00:00
85fba09b67
Merge branch 'fix/fix-public-builds-name-in-pipeline-settings' into 'master'
...
Fix name of feature that restricts access to builds traces
## What does this MR do?
This MR fixes the name of the feature that makes it possible to restrict build traces. This does not disable access to pipelines. Pipelines are still available so we should tie the name with builds, instead of using work "pipeline" there.
See merge request !6980
2016-10-19 15:49:44 +00:00
ce78bdf96b
Its time for 8.14 in master
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-19 18:46:47 +03:00
8e4301d982
Prevent wrong markdown on issue ids when project has Jira service activated
2016-10-19 13:46:04 -02:00
43da118f85
Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support for IdP auto-configuration.
2016-10-19 10:40:25 -05:00
b1947b714b
Merge branch 'corrected-build-page-header-username-to-full-name' into 'master'
...
Changed build header username area to use the full name with the username as the tooltip
## What does this MR do?
Changes build header username to use the full name with the username as the tooltip.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
UI consistency
## Screenshots (if relevant)
## 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html )
- [ ] 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 )
## What are the relevant issue numbers?
Contributes to #21832
See merge request !6272
2016-10-19 14:42:24 +00:00
cc46a0d47c
Merge branch 'fix-escaping' into 'master'
...
fix: commit messages being double-escaped in activities tab
See merge request !6937
2016-10-19 13:56:08 +00:00
12f649fe2a
Merge branch 'rs-revert-title-change' into 'master'
...
Revert issuable title reordering
Reverts !6503 , and uses `to_reference` rather than `iid` for `Issues#show` and `Issues#edit` titles.
See merge request !6983
2016-10-19 13:03:13 +00:00
f560849941
Merge branch 'dz-refactor-some-specs' into 'master'
...
Refactor group_members_controller_spec
Make tests more readable, DRY and closer to RSpec best practices.
See merge request !6985
2016-10-19 12:46:11 +00:00
Douglas Barbosa Alexandre
James Lopez
Rémy Coutable
Bryce Johnson
Fatih Acet
Achilleas Pipinellis
Dmitriy Zaporozhets
Felipe Artur
Patricio Cano
Jacob Schatz
Sean McGivern
Douwe Maan