Alfredo Sumaran
79a4292ffd
Merge branch 'issue_3400_port' of https://gitlab.com/gitlab-org/gitlab-ce into issue_3400_port
2016-03-18 15:27:40 -05:00
Jacob Schatz
46f9790ceb
Fixing rebase conflicts
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
cdd7e1855e
Fixes failing spec
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
73e043d196
Delete unused file
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
53df7263b7
Use new dropdown class for search suggestions
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
2d0f8f928c
Disable highlighting by default
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
b5bd497a1f
Allow to hightlight matches
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
f858ee43ea
Allow to pass header items
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
4e486c6116
Allow to pass input filter param
...
This allow us to set a different input to filter results
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
0b893bec54
Allow data with desired format
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
a0c1aa6d04
Allow to pass non-asynchronous data to GitLabDropdown
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
dccda7d09f
Replace spinner icon for th FontAwesome one
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
2541f59227
Better wording
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
ec0dfff204
Add icons
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
82e3c1f257
Change hidden input id to avoid duplicated IDs
...
The TODOs dashboard already had a #project_id input and it was causing a spec to fail
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
5479795708
Tweak behaviours
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
6a7f4a0767
Apply styling and tweaks to autocomplete dropdown
2016-03-18 14:06:51 -04:00
Alfredo Sumaran and Jacob Schatz
c9e202c1d7
Working version of autocomplete with categorized results
2016-03-18 14:06:51 -04:00
Jacob Schatz
eba0032552
Merge branch 'add_avatar_to_issue_mr_header' into 'master'
...
Add avatar to issue and MR pages header
closes #14395
# For Issues
### Before
### After
# For Merge Request
### Before
### After
See merge request !3301
2016-03-18 17:58:43 +00:00
Dmitriy Zaporozhets
16c62f0d97
Merge branch 'refactor-variables' into 'master'
...
Refactor variables
Fixes #13803 and other color inconsistency across application
cc @jschatz1 @skyruler
See merge request !3304
2016-03-18 17:42:39 +00:00
Douwe Maan
5100ad090b
Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master'
...
Trigger a todo for mentions on commits page
Closes #14006
* Screenshot:
See merge request !3262
2016-03-18 17:10:09 +00:00
Robert Speicher
ba611fdb5d
Merge branch 'filter-label-missing' into 'master'
...
Fixes issue with filter label missing on labels & milestones
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14407
See merge request !3297
2016-03-18 17:01:51 +00:00
Arinde Eniola
5e39846e4b
Add avatar to issue and MR pages header
2016-03-18 17:54:44 +01:00
Dmitriy Zaporozhets
5e2728891e
Cleanup somce css colors
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2016-03-18 17:48:52 +01:00
Dmitriy Zaporozhets
3837f4413a
Re-group scss variables
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2016-03-18 17:37:10 +01:00
Douglas Barbosa Alexandre
02b0c37cab
Refactor Todo#target
2016-03-18 13:27:27 -03:00
Phil Hughes
2f210adee2
Fixes issue with filter label missing on labels & milestones
2016-03-18 16:25:04 +00:00
Robert Speicher
aee6dbc6de
Merge branch 'rs-issue-14259' into 'master'
...
Prevent a 500 when a repository's root_ref is nil
Closes #14259
See merge request !3278
2016-03-18 16:24:51 +00:00
Douglas Barbosa Alexandre
2a8858ca8a
Rename Todo#to_reference to Todo#target_reference
...
Since we're not actually returning a todo reference.
2016-03-18 13:24:47 -03:00
Robert Speicher
7a33afb760
Merge branch 'dashboard-labels' into 'master'
...
Dashboard labels
Previously because there were no JSON endpoint for labels or milestones
it was fetching HTML and parsing that. This is wrong.
It now fetches from a JSON endpoint.
This also fixes the dashboard/issues page not loading labels or
milestones as the path used to be only for a single project. So instead
I have created a endpoint for labels & milestones JSON on dashboard.
See merge request !3253
2016-03-18 16:04:55 +00:00
Phil Hughes
a45cb68809
Fixed failing tests
2016-03-18 15:18:06 +00:00
Phil Hughes
0eecc21485
Updated controller with before_action
...
Fixed other issues based on feedback
2016-03-18 15:18:06 +00:00
Phil Hughes
d847db79cb
Fixes issue on dashboard issues
...
They would try to load JSON from a project even though it isn't a single project
2016-03-18 15:18:06 +00:00
Phil Hughes
645b7a0a33
Full labels data in JSON
2016-03-18 15:18:06 +00:00
Phil Hughes
0858cb097a
Fixed issue with labels dropdown getting wrong labels
2016-03-18 15:18:06 +00:00
Jacob Schatz
9280fd4acd
Merge branch 'fix-mr-close-button' into 'master'
...
Fixes issue with close button not working on MR
Closes #14383
See merge request !3295
2016-03-18 14:49:00 +00:00
Douglas Barbosa Alexandre
05975e96f9
Update CHANGELOG
2016-03-18 11:07:30 -03:00
Douglas Barbosa Alexandre
71cc3caa85
Use Note#for_project_snippet? to skip notes on project snippet
2016-03-18 11:07:30 -03:00
Douglas Barbosa Alexandre
231d4fb9f8
Use Commit#short_id instead of Commit.truncate_sha
2016-03-18 11:07:30 -03:00
Douglas Barbosa Alexandre
2eeeb266e3
Reuse for_commit? on conditional validations
2016-03-18 11:07:30 -03:00
Douglas Barbosa Alexandre
a5bad46505
Update schema info comment on todo related files
2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre
fb72271e24
Use todo.done without ! in the controller to mark todo as done
2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre
c29da3f8ca
Trigger a todo for mentions on commits page
2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre
1e76245d4e
Add commit_id to todos
2016-03-18 11:00:53 -03:00
Douglas Barbosa Alexandre
42834095bc
Change target_id to null on todos
2016-03-18 11:00:53 -03:00
Jacob Schatz
8dfa0a7649
Merge branch 'improved-issue-sidebar' into 'master'
...
Improved issue sidebar
Updated the spacing throughout the sidebar so that it fits better on smaller screens. Also adds a more participants button to show any other participants after the first row.
Closes #13353
See merge request !3097
2016-03-18 13:50:22 +00:00
Phil Hughes
195ef985f3
Added test
2016-03-18 12:42:30 +00:00
Achilleas Pipinellis
e877cfda4d
Merge branch 'docs_select_version_to_install' into 'master'
...
Add note in upgrade guide to choose the correct version tag
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3448
@rspeicher I'm assigning to you since as a release manager you should know better. Let's keep it in this guide for now and then start copying it in the future ones.
See merge request !2284
2016-03-18 12:37:59 +00:00
Achilleas Pipinellis
e1ce7a47fa
Add note in rest of update guides
...
[ci skip]
2016-03-18 14:35:04 +02:00
Achilleas Pipinellis
4d3e8ceea5
Merge branch 'master' into docs_select_version_to_install
2016-03-18 14:31:33 +02:00
