home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,219 Commits 48 Branches 340 Tags
b2dc9176018729efc1969035b30017c2ed81a708
Commit Graph
2034 Commits
Author SHA1 Message Date
Kamil TrzcinskiandPhil Hughes 304979f897 Allow to show the time in the future 2016-06-13 11:06:38 +01:00
Alfredo Sumaran 952660d2cf Fixes a bug when assigning a label to multiple issues 
Fixes the case when we want to assign a label to multiple issues and one of the issues has already the label we want to apply.
 2016-06-10 23:55:50 -05:00
Fatih Acet bcc3f8f237 Fix emoji block selector. 2016-06-11 00:24:24 +03:00
Annabel Dunstone 67a18f34e9 Fix safari logo loading animation safari bug 2016-06-10 12:01:51 -05:00
Annabel Dunstone cb126995aa Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container 2016-06-10 12:01:51 -05:00
Annabel Dunstone ade0a4af8b Fix logo at all screen widths, update sidebar text 2016-06-10 12:01:51 -05:00
Annabel Dunstone a1fbdbb6b1 Move tanuki icon to center of nav bar; keep nav closed by default; remove collapsed nav cookie 2016-06-10 12:01:51 -05:00
Luke "Jared" BennettandLuke "Jared" Bennett 479ecbab9b Tidied dispatcher switch and added shortcuts to project pipelines, milestones and forks pages 
Updated CHANGELOG

Moved CHANGELOG entry
 2016-06-10 17:50:12 +01:00
Luke "Jared" Bennett 20a6111d2b Added ability to skip the Mousetrap binding reset 
Added 'y' shortcut for copying a files immutable content hash link

Updated CHANGELOG

changed ! to not

Moved CHANGELOG entry
 2016-06-10 17:41:02 +01:00
Phil Hughes 638e318ee5 Fixed issue when opening a highlighted line diff 
With the new project nav being fixed, the diff page is scrolling the highlighted under the nav meaning you cant see what is highlighted
 2016-06-10 17:04:54 +01:00
Jacob Schatz d6de816982 Merge branch 'ci-page-ui-update' into 'master' 
CI build page UI update

Closes #2569 

See merge request !3829
 2016-06-10 15:44:21 +00:00
Jacob Schatz c7eecb4a20 Merge branch 'label-create-error-messages' into 'master' 
Correctly shows label errors in dropdown

## What does this MR do?

Correctly shows any errors in the dropdown when creating a new label

## What are the relevant issue numbers?

Closes #18344 

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_09.01.59](/uploads/58dc56b39db20a50adce6f12510025fc/Screen_Shot_2016-06-09_at_09.01.59.png)

See merge request !4553
 2016-06-10 15:38:32 +00:00
Jacob Schatz e99559260b Merge branch 'user-search-dropdown' into 'master' 
Revert change to search all users

## What does this MR do?

Reverts a change that allowed the user to search for all users in the author/assignee dropdown

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

Double check it isn't still searching all users

See merge request !4564
 2016-06-10 15:30:28 +00:00
Connor Shea 18e16e427d Replace raphael-rails with raphael.js so it can be split from the rest of the JavaScript. The gem isn't maintained anymore anyway. Added a network folder with an application.js including raphael components, since that's the only page using it currently. 2016-06-10 09:28:07 -06:00
Jacob Schatz 7aa6768812 Merge branch 'label-filter-fix' into 'master' 
Fixed issue where label filtering didnt work

## What does this MR do?

The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that.

## What are the relevant issue numbers?

Closes #18375 

See merge request !4556
 2016-06-10 15:23:39 +00:00
Rui AndersonandRémy Coutable 07dbd6b388 Allow or not merge MR with failed build 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-10 14:36:54 +02:00
Phil Hughes dc6ec2adf8 CI build page UI update 
Added sidebar
Removed elements not present in design
 2016-06-10 12:07:51 +01:00
Phil Hughes ff702bd6e0 Changed how date gets cleared 2016-06-10 12:04:21 +01:00
Phil Hughes ab722343ad Fixed tests 2016-06-10 11:38:25 +01:00
Phil Hughes 9d09bd08e5 Due date can be removed from milestones 
Closes #15063
 2016-06-10 11:38:25 +01:00
Phil Hughes 10f17c2fcd Correctly shows label errors in dropdown 
Fixes #18344
 2016-06-10 10:48:39 +01:00
Phil Hughes b2b3fb6c01 Revert change to search all users 2016-06-10 10:45:44 +01:00
Phil Hughes a99d25b174 Checks against date parsing instead of string 
Removes template for html string that isn't needed
 2016-06-10 10:41:58 +01:00
Phil Hughes 492e006217 Corrected all sidebar font weights to correctly match the design 2016-06-10 10:41:58 +01:00
Phil Hughes ffd07382b0 Fixed issue with bold in issuable sidebar 2016-06-10 10:41:58 +01:00
Fatih Acet 7bad6814b1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown 2016-06-10 02:41:45 +03:00
Jacob Schatz cea3cf177c Merge branch 'award-emoji-fixes' into 'master' 
Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550
 2016-06-09 23:21:50 +00:00
Fatih Acet 94826d9abe Minor MR comment fixes. 
yes -> true
no -> false
. frequent -> .frequent-emojis
 2016-06-10 01:56:41 +03:00
Fatih Acet d9e3a6a068 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown 
# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee
 2016-06-10 01:36:54 +03:00
Jacob Schatz dbc4f71868 Merge branch 'milestone-tooltip' into 'master' 
Add milestone expire date to the right sidebar

## What does this MR do?
Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed.

## Are there points in the code the reviewer needs to double check?
`common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/17355

## Screencast
![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif)

See merge request !4448
 2016-06-09 22:10:51 +00:00
Phil HughesandJacob Schatz ef48dd01cf Checks based on whether data is loaded not undefined 2016-06-09 17:20:57 -04:00
Phil HughesandJacob Schatz 4456b41b6a Checks for undefined when inserting autocomplete into textarea 2016-06-09 17:20:57 -04:00
Jacob Schatz 87c77718a4 Merge branch 'remove-chart' into 'master' 
Only load Chart.js when necessary.

Only load Chart.js where it's used, namely the Graphs section. Follow up on !4394.

cc: @jschatz1 

See merge request !4516
 2016-06-09 20:51:10 +00:00
Fatih Acet e885c2fd31 Ignore frequent emojis in search. 2016-06-09 23:50:06 +03:00
Jacob Schatz 2cb4cb2ee3 Merge branch 'issue_17607' into 'master' 
Fix local timeago on user dashboard

## What does this MR do?
Fixes incorrect date times on tooltips on the dashboard page

## Are there points in the code the reviewer needs to double check?
Yes,  The tooltip has to be recreated again because we needed a custom CSS classname in order to fix the date being splitted into two lines.

## Why was this MR needed?
Because the datetimes were incorrect we have to have the same format for .timeago() instances.

## What are the relevant issue numbers?
#17607

## Screenshots (if relevant)

**Before**

<img src="/uploads/f40cd58e8086d9675262e98a1fe57885/Screen_Shot_2016-05-24_at_7.23.25_PM.png" width="705">

**After**

<img src="/uploads/bd48046ef11659cc742f827b3404fbcd/Screen_Shot_2016-05-24_at_7.22.29_PM.png" width="704">


See merge request !4285
 2016-06-09 20:39:29 +00:00
Fatih Acet 639347bad4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown 2016-06-09 23:08:56 +03:00
Fatih Acet 24b64edf09 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-09 23:08:30 +03:00
Fatih Acet c987837336 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes 2016-06-09 23:07:39 +03:00
Jacob Schatz d64517c37d Merge branch 'button-focus-state' into 'master' 
Blur button tags when pressed to remove the focus state.

## Before 

![pemnD5exKl](/uploads/333155bf4a6c43715f3fc04d8f5aa35e/pemnD5exKl.gif)


## After

![dCPvSwsuWp](/uploads/9bcfbe59ac8de51e9d2c3edcb3d13ff3/dCPvSwsuWp.gif)

See merge request !4418
 2016-06-09 19:45:17 +00:00
Alfredo Sumaran 89523396ba Update method name for better understanding 2016-06-09 14:38:24 -05:00
Alfredo Sumaran 6ae82d5707 Fix local timeago on user dashboard 2016-06-09 14:38:24 -05:00
Phil Hughes 9830f9a23b Updated subscribe icon 2016-06-09 17:19:14 +01:00
Phil Hughes e796555bdb Fixed issue where label filtering didnt work 
Closes #18375
 2016-06-09 17:13:51 +01:00
Fatih Acet d866faf251 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes 2016-06-09 16:11:07 +03:00
Fatih Acet f6e9078fb6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-09 16:10:40 +03:00
Fatih Acet 757b85c9d4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown 2016-06-09 16:10:18 +03:00
Fatih Acet 522ef5754d Refactor search autocomplete to support groups category contents. 2016-06-09 04:22:13 +03:00
Fatih Acet 7df512d5a2 Add new utils. 2016-06-09 04:21:50 +03:00
Fatih Acet 92af60c244 Move award_menu_url variable into gon object. 2016-06-09 03:37:40 +03:00
Fatih Acet 52525dc4c2 Render frequent emoji block once. 2016-06-09 03:02:49 +03:00