root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
57,228 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

6217 Commits

Author SHA1 Message Date
Douwe Maan 8b68b69572 Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master' 
Fix replying to commit comments on merge requests created from forks

Closes #31772

See merge request !13137
 2017-07-28 16:53:10 +00:00
Sean McGivern 75d04f6a29 Fix replying to commit comments on MRs from forks 
A commit comment shows in the MR, but if the MR is from a fork, it will have a
different project ID to the MR's target project. In that case, add an
note_project_id param so that we can pick the correct project for the note.
 2017-07-28 16:25:13 +01:00
Sean McGivern 883be9c67b Merge branch 'merge-issuable-reopened-into-opened-state' into 'master' 
Merge issuable "reopened" state into "opened"

See merge request !12972
 2017-07-28 15:15:38 +00:00
Tim Zallmann 563cb60e75 Merge branch 'ph-inline-js' into 'master' 
Removed inline JS in shared HAML files

See merge request !13073
 2017-07-28 11:45:29 +00:00
Yorick Peterse 6ef87a2083
Merge issuable "reopened" state into "opened" 
Having two states that essentially mean the same thing is very much like
having a boolean "true" and boolean "mostly-true": it's rather silly.
This commit merges the "reopened" state into the "opened" state while
taking care of system notes still showing messages along the lines of
"Alice reopened this issue".

A big benefit from having only two states (opened and closed) is that
indexing and querying becomes simpler and more performant. For example,
to get all the opened queries we no longer have to query both states:

    SELECT *
    FROM issues
    WHERE project_id = 2
    AND state IN ('opened', 'reopened');

Instead we can query a single state directly, which can be much faster:

    SELECT *
    FROM issues
    WHERE project_id = 2
    AND state = 'opened';

Further, only having two states makes indexing easier as we will only
ever filter (and thus scan an index) using a single value. Partial
indexes could help but aren't supported on MySQL, complicating the
development process and not being helpful for MySQL.
 2017-07-28 13:31:51 +02:00
Phil Hughes 795a63d83f fixed form action not submitting the correct URL 2017-07-28 09:00:09 +01:00
Tim Zallmann 7e17f9bc89 Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into 'master' 
Resolve "Transform user profile javascript into async bundle"

Closes #35224

See merge request !12929
 2017-07-28 07:27:13 +00:00
Sean McGivern fa4d08ed81 Merge branch '32483-jira-error' into 'master' 
Display specific error message when JIRA test fails

Closes #32483

See merge request !13100
 2017-07-28 07:21:04 +00:00
Phil Hughes 082d425b5d Merge branch 'master' into ph-inline-js 2017-07-28 08:07:56 +01:00
Mike Greiling 288e8ea1e7 resolve remaining eslint violations 2017-07-28 01:27:06 -05:00
Mike Greiling 17b43cd4a1 resolve eqeqeq, newline-per-chained-call, no-unused-vars, and no-else-return eslint violations 2017-07-28 01:27:06 -05:00
Mike Greiling c4718a5f2f resolve consistent-return eslint violation 
[ci-skip]
 2017-07-28 01:27:05 -05:00
Mike Greiling 9d5bdb5d31 resolve prefer-template and quotes eslint violations 2017-07-28 01:27:05 -05:00
Mike Greiling ce4e891065 resolve no-mixed-operators and no-return-assign eslint violations 2017-07-28 01:27:05 -05:00
Mike Greiling 45a446ea94 resolve comma-dangle and object-shorthand eslint violations 2017-07-28 01:27:04 -05:00
Mike Greiling 6902145716 resolve camelcase violations 2017-07-28 01:27:04 -05:00
Mike Greiling c4fae77e89 remove janky function binding in activity calendar class 2017-07-28 01:27:04 -05:00
Mike Greiling ffa4cedab6 fix all eslint violations in user_tabs.js 2017-07-28 01:27:03 -05:00
Mike Greiling a6732f59e4 remove implied "GET" http method option 2017-07-27 14:43:18 -05:00
Mike Greiling 8cfc89bc9b remove needless brackets object accessor syntax 2017-07-27 14:41:26 -05:00
Phil Hughes 76704c7960 Merge branch 'master' into ph-inline-js 2017-07-27 16:00:30 +01:00
Alexis Reigel eda001565c fetch gpg signature badges by ajax 2017-07-27 15:46:03 +02:00
Alexis Reigel 4648d0016f popover trigger needs to be defined in js init 
According to https://github.com/twbs/bootstrap/issues/10547 it's not
possible to have the trigger defined on the delegated element, i.e. not
defined as a data attribute.
 2017-07-27 15:43:36 +02:00
Alexis Reigel 78b5264511 add gpg commit popover badges 2017-07-27 15:43:36 +02:00
Tim Zallmann c580238581 Inline JS Removal for Merge Requests 2017-07-27 08:30:14 +00:00
Jarka Kadlecova aa2b3ff1e4 Display specific error message when JIRA test fails 2017-07-27 07:51:36 +02:00
Phil Hughes 425dbdd222 fixed label subscription & merge conflicts 2017-07-26 11:13:35 +01:00
Tim Zallmann 9aa2205a15 Resolve "Memory usage notice doesn't link anywhere" 2017-07-26 09:31:17 +00:00
Clement Ho 3f21d03f26 Merge branch 'fix-conflict-pluralized' into 'master' 
FIX #35027 : conflict pluralized

Closes #35027

See merge request !13051
 2017-07-25 17:23:52 +00:00
Phil Hughes 887227e037 moved some more inline code 
removed some global variable comments
 2017-07-25 16:46:15 +01:00
Phil Hughes fe27de8bf1 moved some code into new files 
fixed duplication of code
 2017-07-25 16:27:51 +01:00
Phil Hughes 205090fcfb Removed inline JS in shared HAML files 2017-07-25 11:56:41 +01:00
Clement Ho ea6dfcad9f Merge branch '35156-more-responsive-nav' into 'master' 
fix resize bug for title and collapsible nav menus

Closes #35156

See merge request !12904
 2017-07-24 19:01:50 +00:00
Tim Zallmann 52b8a0db68 Resolve "Lazy load images on the Frontend" 2017-07-24 17:36:52 +00:00
Tim Zallmann fef5a4fddd How to Merge to external File 2017-07-24 17:21:05 +02:00
Emilien Mottet a8b33d7b5d fix conflict pluralized 2017-07-24 17:11:12 +02:00
Filipa Lacerda 87521660e8 Merge branch '35391-fix-star-i18n-in-js' into 'master' 
Fix translations for Star/Unstar in JS file

Closes #35391

See merge request !13013
 2017-07-24 13:50:14 +00:00
Bryce Johnson 91cbab7b5f Bulk update sidebar UI polish 2017-07-24 07:47:38 +00:00
Simon Knox 9408ed7f5a fix resize bug for title and collapsible nav menus 2017-07-22 07:41:37 +10:00
Rémy Coutable 53c5b6717c Fix translations for Star/Unstar in JS file 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-07-21 12:44:16 +02:00
Filipa Lacerda b7d372d942 Merge branch '31031-convert-protected-branches-es6' into 'master' 
Convert Protected Branches feature JS code to ES6

See merge request !12970
 2017-07-21 09:50:29 +00:00
Clement Ho 3e89960d4a Refactor filtered search dropdown parameters 2017-07-20 19:17:34 +00:00
kushalpandya fcdcc0d351 Spread used props 2017-07-20 23:40:14 +05:30
kushalpandya 80314ea876 Move module initialization to bundle root 2017-07-20 17:39:00 +05:30
kushalpandya 4b45a1b322 Initialize module on bundle load 2017-07-20 17:38:35 +05:30
kushalpandya 083ad12070 Remove unnecessary `scrollTo` 2017-07-20 17:38:11 +05:30
Phil Hughes 652b2d0d29 Merge branch '34036-sidebar-mobile' into 'master' 
Resolve "Navigation - Add contextual navigation on mobile"

Closes #34036

See merge request !12944
 2017-07-20 09:49:30 +00:00
Annabel Dunstone Gray b711e10093 Fix JS; make buttons sr accessibile; fix overlay 2017-07-19 23:25:53 -05:00
Stan Hu 9d03637307 Merge branch 'fix-date-off-by-1' into 'master' 
Fix date bug in JS that makes dates not work with strings

Closes #29916

See merge request !12147
 2017-07-19 22:50:38 +00:00
Filipa Lacerda f6ec281679 Merge branch 'new-nav-fix-contextual-breadcrumbs' into 'master' 
Contextual breadcrumb title fixes

Closes #34030 and #34033

See merge request !12602
 2017-07-19 16:24:49 +00:00