home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,485 Commits 48 Branches 340 Tags
79a4292ffdcf53fb479a720ccae2ae41bd7982e5
Commit Graph
13020 Commits
Author SHA1 Message Date
Jacob Schatz 46f9790ceb Fixing rebase conflicts 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz cdd7e1855e Fixes failing spec 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 73e043d196 Delete unused file 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 53df7263b7 Use new dropdown class for search suggestions 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 2d0f8f928c Disable highlighting by default 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz b5bd497a1f Allow to hightlight matches 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz f858ee43ea Allow to pass header items 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob 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 SumaranandJacob Schatz 0b893bec54 Allow data with desired format 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz a0c1aa6d04 Allow to pass non-asynchronous data to GitLabDropdown 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz dccda7d09f Replace spinner icon for th FontAwesome one 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 2541f59227 Better wording 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz ec0dfff204 Add icons 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob 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 SumaranandJacob Schatz 5479795708 Tweak behaviours 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 6a7f4a0767 Apply styling and tweaks to autocomplete dropdown 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob 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
![Screen_Shot_2016-03-18_at_4.27.25_PM](/uploads/b097c8e304c9737e2f46ee25667829bf/Screen_Shot_2016-03-18_at_4.27.25_PM.png)

### After
![Screen_Shot_2016-03-18_at_4.22.10_PM](/uploads/f7d2b12c9455950c2e660b33e27c1827/Screen_Shot_2016-03-18_at_4.22.10_PM.png)

# For Merge Request

### Before
![Screen_Shot_2016-03-18_at_4.27.09_PM](/uploads/50c7b6ee346f749f448647004ae6031b/Screen_Shot_2016-03-18_at_4.27.09_PM.png)

### After
![Screen_Shot_2016-03-18_at_4.24.17_PM](/uploads/abd37ccf030e0b6d10521a6937206de6/Screen_Shot_2016-03-18_at_4.24.17_PM.png)

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:

![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png)

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
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 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
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
Douwe Maan dadd28e317 Merge branch 'fix-mr-source-sha' into 'master' 
Fix MergeRequest#source_sha when there is no diff

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

### Overview

This MR fixes an unhandled Exception when visiting the page of an open Merge Request  without diff.

### Description

`MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when an open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`.

This was without consequences before – but since !2217 was merged (a few days ago), it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This can be reproduced when visiting the http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2 page on a fresh local Gitlab setup.

This MR fixes the crash, by making sure that `source_sha` returns a
correct result even when there is no diff available. I also added tests.

@DouweM I believe you wrote most of this code in the first place ; does this looks correct to you, or is there a better way to resolve this issue maybe?

See merge request !3135
 2016-03-18 12:28:43 +00:00
Jacob Schatz f4b6a89252 Merge branch 'issue-fade-load' into 'master' 
Changing filter dropdowns shows loading

Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well

![issues](/uploads/3335f09f7df88b6d419de7fd3d6857d2/issues.gif)

Closes #14359

See merge request !3237
 2016-03-18 12:25:09 +00:00
Douwe Maan 9813eac56b Merge branch 'confidential-issues' into 'master' 
Add confidential issues

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

More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227

See merge request !3282
 2016-03-18 12:04:56 +00:00
Phil Hughes c51af604e5 Another CS style fix 2016-03-18 11:42:15 +00:00
Phil Hughes e8d52499db Fixed some CS styling issues 
Fixed bug where wouldn't work on MR index
 2016-03-18 11:42:15 +00:00
Phil Hughes 16d02de56e Fixed issue with dashboard issues not reloading 2016-03-18 11:40:16 +00:00
Phil Hughes 882ebfc296 Changing filter dropdowns shows loading 
Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well
 2016-03-18 11:40:16 +00:00
Phil Hughes 4885423fea Fixes issue with close button not working on MR 
Closes #14383
 2016-03-18 11:36:48 +00:00
Yorick Peterse 3f0d780c19 Show a notice for diffs that are too large 
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
 2016-03-18 12:30:46 +01:00