home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,214 Commits 48 Branches 340 Tags
83bda94ffcfe1944ea255fdbb8dfd9dac5b97d9f
Commit Graph
14102 Commits
Author SHA1 Message Date
Mehmet BeydoganandRobert Speicher 83bda94ffc Update due date asc scope for mysql 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
Jacob Schatz 1e596fef1c Merge branch 'right-sidebar-z-index' into 'master' 
Increased z-index of right sidebar

Fixes issue with active button overlapping it

Closes #15243

See merge request !3722
 2016-04-20 19:22:03 +00:00
Jacob Schatz b4ed6efd50 Merge branch '15213-dialog-input' into 'master' 
Add margin to top of form actions

Closes #15213

Also fixes other modal inputs (like add new directory, etc)  

![Screen_Shot_2016-04-20_at_1.47.14_PM](/uploads/14b474da2f86dcc3c1afd9e8ea09e812/Screen_Shot_2016-04-20_at_1.47.14_PM.png)

See merge request !3841
 2016-04-20 19:21:11 +00:00
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master' 
Mutliple label filter

Fixes #989 

See merge request !3438
 2016-04-20 19:18:32 +00:00
Jacob Schatz 9a60887199 Merge branch 'remove-duplicate-ids' into 'master' 
Removed duplicate ID's from the HTML



See merge request !3818
 2016-04-20 19:11:38 +00:00
Annabel Dunstone ef0c87f67f Add margin to top of form actions 2016-04-20 13:42:27 -05:00
Phil Hughes 490f77318b Fixed tests because of nil array 2016-04-20 19:32:13 +01:00
Jacob Schatz 56495fd12a Merge branch 'fix_infinite_scroll_breaks_on_back_button_activity_feed' into 'master' 
fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back

![arrg_](/uploads/53b2a01d3b55938cc12c805e1a81ff6b/arrg_.gif)

See merge request !3835
 2016-04-20 18:25:27 +00:00
Jacob Schatz ae6b44cf31 Merge branch '15104-mobile-comment-bug' into 'master' 
Discussion note icon shows up when you click on diff on touch screen

Fixes #15104 

* Fix bug that stopped discussion note button from showing up on iOS
* Shifted button a few `px` to fix slight cutoff
<div>
<img src="/uploads/9d507091f33aa69ef68323386bf3a5c2/Screen_Shot_2016-04-15_at_12.08.46_PM.png" width="300px">
<img src="/uploads/a964a2a46636cbe4593abf272b5796f7/Screen_Shot_2016-04-15_at_12.11.40_PM.png" width="300px">
</div>

See merge request !3755
 2016-04-20 18:22:21 +00:00
Phil Hughes ab93ea04aa Correctly checks for undefined in coffeescript 🙈 2016-04-20 17:52:55 +01:00
Arinde Eniola 493784da43 fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back 2016-04-20 17:47:07 +01:00
Dmitriy Zaporozhets 832cdd3d51 Merge branch 'backport_changes_from_ee' into 'master' 
Backport select_helper from EE



See merge request !3825
 2016-04-20 16:38:11 +00:00
Phil Hughes 439a72803b Any label & no label out weigh other labels - these two will clear previously selected labels 
Fixed issue with no label not working correctly
 2016-04-20 17:23:10 +01:00
Jacob Schatz 364354bce4 Merge branch 'edit-link-anchor-stop' into 'master' 
Fixed issue with sidebar edit links toggling anchor

This caused an issue with the page scrolling from the bottom to the top. Also stopped the dropdown links doing the same.

See merge request !3819
 2016-04-20 16:18:44 +00:00
Jacob Schatz f39c647525 Merge branch 'issue_15366' into 'master' 
Render relative timestamps for all commits in projects commit list

fixes #15366 

See merge request !3821
 2016-04-20 16:08:30 +00:00
Phil Hughes 75626d5f01 Label text color comes from JSON 
Created issuable singleton to house the filtering
 2016-04-20 17:00:12 +01:00
Jacob Schatz 1ec203a98f Merge branch 'system-note-commented' into 'master' 
Removed commented text from system notes

![Screen_Shot_2016-04-20_at_14.49.22](/uploads/b1617af49cc35595afd6dfcf761a775c/Screen_Shot_2016-04-20_at_14.49.22.png)

See merge request !3836
 2016-04-20 14:50:16 +00:00
Jacob Schatz 8cb3bf326a Merge branch 'new-mr-layout-fix' into 'master' 
Fixed issue with new MR form layout

Currently it is all over the place:

![Screen_Shot_2016-04-20_at_14.59.48](/uploads/09c3dffc2138140e3b009ab2564f0aca/Screen_Shot_2016-04-20_at_14.59.48.png)

Now:

![Screen_Shot_2016-04-20_at_14.59.44](/uploads/ef5ba8b7393253ecb732c57ba37dd0cf/Screen_Shot_2016-04-20_at_14.59.44.png)

See merge request !3837
 2016-04-20 14:49:59 +00:00
Jacob Schatz f23f274b8d Merge branch 'note-form-text-color' into 'master' 
Fixes issue with note form inheriting text color

It was only really noticeable on dark themed diffs

![Screen_Shot_2016-04-20_at_14.44.58](/uploads/4f32b487de7e4c09a494dc3c8c767ece/Screen_Shot_2016-04-20_at_14.44.58.png)

See merge request !3834
 2016-04-20 14:26:28 +00:00
Phil Hughes 9101444c45 Fixed issue with new MR form layout 2016-04-20 14:59:07 +01:00
Phil Hughes 04c992f3cf Removed commented text from system notes 2016-04-20 14:48:53 +01:00
Phil Hughes 98b1c77e24 Fixes issue with note form inheriting text color 2016-04-20 14:44:27 +01:00
Arinde Eniola a845252983 get the multi filter labels feature to work on merge request, also escape characters in the templates to prevent xss attack 2016-04-20 13:55:19 +01:00
Douwe Maan b016d4356d Also show Revert and Cherry-pick when the source branch can't be removed 2016-04-20 14:28:34 +02:00
Douwe MaanandDouwe Maan d00e5455ee Verify the MR being displayed question has a merge commit set and can be cherry-picked 2016-04-20 14:28:19 +02:00
Valery Sizov 1965ff3eb2 Backport select_helper from EE 2016-04-20 15:07:06 +03:00
Phil Hughes 1a7ccd0f0a Removed animation from labels filter 2016-04-20 11:47:35 +01:00
Tomasz Maczukin a84d0204bf Fix Build#append_trace method usage when trace file doesn't exists yet 2016-04-20 11:54:06 +02:00
Tomasz Maczukin dd29283a88 Make sure that appending is done on a valid length 2016-04-20 11:53:44 +02:00
Tomasz Maczukin 360bd831bf Add range checking 2016-04-20 11:53:43 +02:00
Tomasz Maczukin 38a1378e63 Add incremental build trace update API 2016-04-20 11:53:39 +02:00
Rémy Coutable d712789054 Merge branch 'slack_wiki_notifications' into 'master' 
add slack notifications for wiki pages

## What does this MR do?

Lets the Slack service be configured to send notifications when wiki pages are created or edited.

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

I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :)

## Why was this MR needed?

Related to #563 and fixes #4233.



See merge request !2998
 2016-04-20 08:12:48 +00:00
Rémy Coutable ca3fafb904 Merge branch 'feature/raw-trace-output' into 'master' 
Add raw build trace output

Closes #15308, #15147

Changes in the UI:

- on finished build:

    ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png)

- on running build:

    ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png)

See merge request !3767
 2016-04-20 08:11:50 +00:00
Robert Speicher 3d4875f86a Merge branch 'license-templates-and-api-12804' into 'master' 
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
 2016-04-20 01:38:49 +00:00
Sebastian Klier edd07e2363 Fix wiki tests 2016-04-20 08:25:41 +08:00
Sebastian Klier d472810e49 formatting and test structure 2016-04-20 08:25:41 +08:00
Sebastian Klier a88f0a1fd8 add wiki_page helper to url_builder 2016-04-20 08:25:41 +08:00
Sebastian Klier 559ef41d32 improve check if wiki page is persisted 2016-04-20 08:25:41 +08:00
Sebastian Klier dac548b320 remove unnecessary methods 2016-04-20 08:25:40 +08:00
Sebastian Klier 54661d3d44 add slack notifications for wiki pages 
update changelog
 2016-04-20 08:25:40 +08:00
Robert Speicher 9617c274ab Merge branch 'issue_15390' into 'master' 
Fix javascript errors with invalid json because of commas

fixes #15390 

See merge request !3827
 2016-04-19 21:46:00 +00:00
Tomasz Maczukin 0a13f5f864 Use Rails-way to send file by X-Sendfile 2016-04-19 23:18:43 +02:00
Tomasz Maczukin 81510b46d5 Add feature specs for raw trace 2016-04-19 23:17:50 +02:00
Tomasz Maczukin bf4371d60d Switch raw trace to use X-Sendfile header 2016-04-19 23:17:49 +02:00
Tomasz Maczukin 27d1349f2b Add raw trace output for GitLab Workhorse 2016-04-19 23:17:49 +02:00
Felipe Artur 97b5e49d30 Fix javascript errors with invalid json because of commas 2016-04-19 17:54:20 -03:00
Robert Speicher c3cc332080 Merge remote-tracking branch 'dev/master' into 'master' 2016-04-19 16:10:39 -04:00
Sytse Sijbrandij 7543bc1776 CLearify shared runner warning. 2016-04-19 21:51:19 +02:00
Robert Speicher 6a19467c41 Merge branch '15139-fix-constants-redefinition-warnings' into 'master' 
Define constants only if not defined yet and freeze them

Fixes #15139.

See merge request !3810
 2016-04-19 19:21:50 +00:00