home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,021 Commits 48 Branches 340 Tags
5f39729c19fa22836686dab32fbcf7c34f32fd41
Commit Graph
27021 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Barbosa Alexandre 5f39729c19 Update octokit gem to version 4.3.0 2016-04-18 17:02:40 -03:00
Robert Speicher 387b025d15 Merge branch 'gh-keep-issues-prs-references' into 'master' 
Use GitHub Issue/PR number as iid to keep references

Closes #15294 

See merge request !3759
 2016-04-18 19:32:23 +00:00
Jacob Schatz 09d2da2091 Merge branch 'dropdown-filter-select' into 'master' 
Fixed issue with multi select not working with arrow keys



See merge request !3792
 2016-04-18 19:14:40 +00:00
Jacob Schatz 4c59557f94 Merge branch '645-profile-update-bug' into 'master' 
Add null check to formData.append

Fixes https://gitlab.com/gitlab-com/support-forum/issues/645

See merge request !3799
 2016-04-18 19:08:42 +00:00
Jacob Schatz bf41703fd2 Merge branch 'change_target_branch_link_color' into 'master' 
Change the link color of the target branch in a merge rquest

closes #15296

See merge request !3786
 2016-04-18 19:02:13 +00:00
Robert Speicher 007a683f9c Merge branch 'fix-migrate-repo-size-migration' into 'master' 
Use raw SQL commands for 20140502125220 MigrateRepoSize

Partial fix for #15210

See merge request !3789
 2016-04-18 18:51:51 +00:00
Jacob Schatz bd65a2f6b2 Merge branch 'mobile-header-overlap' into 'master' 
Fixed overlap in header on mobile

![Screen_Shot_2016-04-18_at_08.48.29](/uploads/8f371d0c717a57ca7afb29415e13d96c/Screen_Shot_2016-04-18_at_08.48.29.png)

See merge request !3777
 2016-04-18 18:44:15 +00:00
Jacob Schatz f18c613383 Merge branch 'dropzone-class-remove' into 'master' 
Removes dropzone focus class after dropping file



See merge request !3756
 2016-04-18 18:37:00 +00:00
Jacob Schatz 96b6cf9308 Merge branch 'note-form-focus-color' into 'master' 
Updated note form focus to better match form-control focus

![Screen_Shot_2016-04-15_at_09.47.52](/uploads/39e02f79a72798ecc6dc946c7b3c8e2e/Screen_Shot_2016-04-15_at_09.47.52.png)

See merge request !3739
 2016-04-18 18:36:26 +00:00
Jacob Schatz ec74ae0616 Merge branch 'parallel-diff' into 'master' 
Wrap code in parallel view

Code scrolling was breaking the parallel layout. It should wrap on 'Side-by-side' mode

<img src="/uploads/db657e6c7f08ce57f1be615d7193136a/Screen_Shot_2016-04-14_at_4.28.31_PM.png" width="700px">

See merge request !3731
 2016-04-18 18:26:14 +00:00
Jacob Schatz e4f1d1367b Merge branch 'commit-timeago-fix' into 'master' 
Fixed issue with commit time not using timeago



See merge request !3723
 2016-04-18 18:05:53 +00:00
Stan Hu f30053ba60 Use raw SQL commands for 20140502125220 MigrateRepoSize 
Partial fix for #15210
 2016-04-18 11:05:16 -07:00
Annabel Dunstone beb32f31fb Add null check to formData.append 2016-04-18 13:04:36 -05:00
Robert Speicher e6ee1f36c4 Merge branch 'diff-js-error-fix' into 'master' 
Fixed issue with spinner not hiding on diff changes

See merge request !3793
 2016-04-18 16:30:41 +00:00
Robert Speicher ea615534ca Merge branch 'tag-grape-allowed' into 'master' 
Add "action" tag to /internal/allowed API

See merge request !3791
 2016-04-18 16:21:04 +00:00
Phil Hughes 872d31d6e9 Fixed issue with spinner not hiding on diff changes 2016-04-18 16:56:48 +01:00
Phil Hughes ea71145418 Fixed issue with multi select not working with arrow keys 2016-04-18 16:45:49 +01:00
Yorick Peterse b9698d2b45 Add "action" tag to /internal/allowed API 
This allows us to re-use any other analytics that rely on the "action"
tag having a value set.
 2016-04-18 17:44:24 +02:00
Douwe Maan 58665b64f5 Merge branch 'issue_3508' into 'master' 
Restrict public users for private instances

Implements #3508

See merge request !3440
 2016-04-18 15:20:13 +00:00
Douglas Barbosa Alexandre c9f2fc3c18 Update CHANGELOG 2016-04-18 12:15:50 -03:00
Douglas Barbosa Alexandre d13bba44f0 Use GitHub Issue/PR number as iid to keep references 
With these changes we don’t lost the issue/pr references when importing
them to GitLab.
 2016-04-18 12:15:50 -03:00
Rémy Coutable 70e6fa3106 Merge branch 'transaction-query-count' into 'master' 
Count the number of SQL queries per transaction

cc @pcarranza 

See merge request !3783
 2016-04-18 14:18:13 +00:00
Felipe Artur 2366768d3b Add changelog entry 2016-04-18 11:12:28 -03:00
Felipe Artur 820c08cefd Fix documentation and improve permissions code 2016-04-18 11:12:28 -03:00
Felipe Artur 7d54e721da Insert instructions in admin page and permissions document 2016-04-18 11:12:28 -03:00
Felipe Artur 09c8cf9de6 Remove group members check 2016-04-18 11:12:28 -03:00
Felipe Artur ce96d482d9 Insert users check into api 2016-04-18 11:12:27 -03:00
Felipe Artur 07b38c3b38 Code fixes 2016-04-18 11:12:27 -03:00
Felipe Artur 147879ae66 Fix specs 2016-04-18 11:12:27 -03:00
Felipe Artur e8a77c0aee Fix code 2016-04-18 11:12:27 -03:00
Felipe Artur 668d6ffa43 Add specs and fix code 2016-04-18 11:12:27 -03:00
Felipe Artur 57519565f1 Move verification to abilities 2016-04-18 11:12:27 -03:00
Felipe Artur b05f0a4858 Restrict user profiles based on restricted visibility levels 2016-04-18 11:11:36 -03:00
Jacob Schatz 5ae4fd2181 Merge branch 'tasklist-fix' into 'master' 
Fixed issue with tasklist toggling sidebar refresh

Closes #15270

See merge request !3782
 2016-04-18 13:37:27 +00:00
Jacob Schatz 2c8c898318 Merge branch 'import-feedback' into 'master' 
Added loading icon to import buttons

See #14488 for more details

See merge request !3662
 2016-04-18 13:30:16 +00:00
Jacob Schatz d337d27e1c Merge branch 'print-style' into 'master' 
Print style

[test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf)

Closes #14201

See merge request !3784
 2016-04-18 13:29:13 +00:00
Jacob Schatz 4d5d619457 Merge branch 'discussion-notes' into 'master' 
Discussion notes update

- At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
- Moved the dates to be in the header like other notes
- Fixed overlapping issue on mobile

See merge request !3720
 2016-04-18 13:03:24 +00:00
Yorick Peterse 7e6f0ac0e0 Count the number of SQL queries per transaction 
Fixes gitlab-org/gitlab-ce#15335
 2016-04-18 14:53:13 +02:00
Phil Hughes fe3ac403b9 Addressed feedback 2016-04-18 13:45:26 +01:00
Grzegorz Bizon 06952aaf24 Merge branch 'feature/ci-job-env-variables' into 'master' 
Add environment variables on a job level in CI

Make it possible to define environment variables on a job level.

Closes #14716

See merge request !3612
 2016-04-18 12:28:19 +00:00
Dmitriy Zaporozhets 2b8fc1387b Merge branch 'edit-last-comment' into 'master' 
Scroll to the last comment I made and edit it.

Pressing up in an empty comment box will edit your last comment. 

Also now when you click edit on a comment it will put the cursor at the end.

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

![scrollup](/uploads/b056fdc479d39311f2be412458028a83/scrollup.gif)

See merge request !3757
 2016-04-18 11:49:42 +00:00
Grzegorz Bizon 1339fda1cd Minor refactorings in CI config 2016-04-18 13:36:52 +02:00
Arinde Eniola 0592112c6e change the link color of the target branch in a merge rquest 2016-04-18 12:36:15 +01:00
Grzegorz Bizon 2972a991df Add minor fixes in docs for job-specific variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 2b1c08be8f Validate job-level variables in YAML config file 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a2957291b3 Update documentation on job level build variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a264973905 Improve grammar in CI documentation for build vars 2016-04-18 13:17:48 +02:00
Grzegorz Bizon 5d89bdb16a Add documentation for job-level build variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon cf3e3effb0 Minor refactoring in code related to job variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon a6260b1eb7 Remove code that removes duplicate CI variables 
At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
 2016-04-18 13:17:48 +02:00