summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-0/+3
| | | |
| * | | Simplify broadcast message JSRobert Speicher2016-01-131-3/+4
| | | | | | | | | | | | | | | | Also resets the default example message when the user input is blank.
| * | | Move broadcast message form to a partialRobert Speicher2016-01-131-2/+1
| | | |
| * | | Style the broadcast message formRobert Speicher2016-01-131-0/+4
| | |/ | |/|
| * | Merge branch 'referenced-merge-requests' into 'master' Dmitriy Zaporozhets2016-01-133-1/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge request close message moved and merge request now refered by `!`. Fixes #4161 ![Screen_Shot_2016-01-12_at_8.38.57_AM](/uploads/9390ce0ebd1d14bfc83130ff4913a823/Screen_Shot_2016-01-12_at_8.38.57_AM.png) See merge request !2387
| | * | changes `$quote-gray` to `$secondary-text`referenced-merge-requestsJacob Schatz2016-01-122-2/+2
| | | |
| | * | makes message plural for multiple MRs and removes from loop. Duh.Jacob Schatz2016-01-121-1/+5
| | | |
| | * | merge request close message moved and merge request now refered by `!`.Jacob Schatz2016-01-122-0/+6
| | | |
| * | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-133-15/+33
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Comment and close button does not submit comment See merge request !2399
| | * | gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-122-2/+22
| | | |
| | * | adds back in discussion.haml.html for issues commenting and ↵Jacob Schatz2016-01-121-0/+2
| | | | | | | | | | | | | | | | closing/reopening properly.
| | * | reverting MR ajax changes, which will be in a different MRJacob Schatz2016-01-121-3/+2
| | | |
| | * | restores merge request coffee fileJacob Schatz2016-01-121-49/+0
| | | |
| | * | fixes conflictsJacob Schatz2016-01-1158-234/+449
| | |\ \
| | * | | initial json requests instead of HTMLJacob Schatz2016-01-072-2/+9
| | | | |
| | * | | adds ajax open and close merges, with discussion/comments working as wellJacob Schatz2016-01-051-0/+43
| | | | |
| | * | | removes commented out code.Jacob Schatz2015-12-301-2/+0
| | | | |
| | * | | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax.Jacob Schatz2015-12-292-15/+13
| | | | |
| * | | | Merge branch 'active-state-on-button-makes-it-uppercase' into 'master' Dmitriy Zaporozhets2016-01-121-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes bolded on active for dropdowns, sitewide. Fixes #6056 <br/> **Note:** this change applies to all dropdowns. Currently all dropdowns using bootstrap's dropdown.js apply a bold and larger font for an active state. See merge request !2377
| | * | | | changes bolded on active for dropdowns, sitewide.active-state-on-button-makes-it-uppercaseJacob Schatz2016-01-111-3/+2
| | | |/ / | | |/| |
| * | | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
| |/ / / | | | | | | | | | | | | | | | | Prevents a double-click from causing the logo to sweep forever after a load completes.
| * | | Merge branch 'rs-woff-fonts' into 'master' Dmitriy Zaporozhets2016-01-1132-7/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use WOFF versions of SourceSansPro See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023 See merge request !2357
| | * | | Use WOFF versions of SourceSansPrors-woff-fontsRobert Speicher2016-01-0932-7/+8
| | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023
| * | | | Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-112-102/+101
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ZenMode - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling. See merge request !2354
| | * | | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-082-102/+101
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling.
| * | | | Only load autocomplete data when actually neededYorick Peterse2016-01-111-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Previously this would result in autocomplete data being loaded for every page (e.g. the page showing all Git branches of a project).
| * | | | Merge branch 'autocomplete-on-load' into 'master' Dmitriy Zaporozhets2016-01-111-13/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load autocomplete data when loading an issue page See merge request !2312
| | * | | | Load autocomplete data when loading an issue pageautocomplete-on-loadYorick Peterse2016-01-081-13/+12
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the dropdown is fully available the moment a user starts typing out a username, issue ID, etc. While this won't speed up loading the autocomplete data itself it should at least make it less annoying for the user.
| * | | | Merge branch 'new-branch-position-fix' into 'master' Dmitriy Zaporozhets2016-01-111-1/+6
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes new branch button positioning, when visible and not visible container Fixes #5893 #5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. See merge request !2348
| | * | | fixes new branch button positioning, when visible and not visible containernew-branch-position-fixJacob Schatz2016-01-081-1/+6
| | |/ /
| * | | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-081-12/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
| | * | Add API project upload endpointDouwe Maan2016-01-071-12/+2
| | | |
| * | | Merge branch 'cross-project-reference-move' into 'master' Dmitriy Zaporozhets2016-01-081-1/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds reference to the bottom of sidebar Fixes #4183 ![Screen_Shot_2016-01-07_at_3.17.32_PM](/uploads/8d71b475f1775d555cf5898921e86a1d/Screen_Shot_2016-01-07_at_3.17.32_PM.png) See merge request !2339
| | * | | adds 85% width for textcross-project-reference-moveJacob Schatz2016-01-071-1/+1
| | | | |
| | * | | adds reference to the bottom of sidebarJacob Schatz2016-01-071-1/+9
| | | | |
| * | | | css change to height to make gray container fitbanner-out-of-placeJacob Schatz2016-01-072-0/+2
| |/ / /
| * | | Use fadeTo instead of cssajax-filter-commitsDmitriy Zaporozhets2016-01-071-5/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix typo in js method and some repeating cssDmitriy Zaporozhets2016-01-072-3/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Prevent loading first 20 commits twiceDmitriy Zaporozhets2016-01-071-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add ajax filtering for commits listDmitriy Zaporozhets2016-01-071-40/+27
| | | | | | | | | | | | | | | | | | | | | | | | Also handle commits list with Pager class to prevent code duplication Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add search field to commits pageDmitriy Zaporozhets2016-01-071-7/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'fix-missing-day-in-network-graph' into 'master' Dmitriy Zaporozhets2016-01-071-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing date of month in network graph when commits span a month Closes #3635, #1383 Before: ![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png) After: ![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png) See merge request !2325
| | * | Fix missing date of month in network graph when commits span a monthStan Hu2016-01-061-1/+1
| | | | | | | | | | | | | | | | Closes #3635, #1383
| * | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-076-1/+160
| | | |
| * | | Enable Microsoft Azure OAuth2 supportJanis Meybohm2016-01-061-0/+0
| |/ /
| * | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
| | * \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-0340-295/+525
| | |\ \
| | * \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-1221-23/+148
| | |\ \ \
| | * \ \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-022-8/+8
| | |\ \ \ \
| | * | | | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+59
| | | | | | |
View Lorry Controller Status