| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'label-text-color-sidebar' into 'master' | Robert Speicher | 2016-04-21 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | Fixes text color on labels in sidebar Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color. With this, the text color comes from the JSON. See merge request !3846 | ||||
| | * | Reverted link changes | Phil Hughes | 2016-04-21 | 1 | -1/+1 |
| | | | |||||
| | * | Removed console.log | Phil Hughes | 2016-04-21 | 1 | -1/+0 |
| | | | |||||
| | * | Fixes text color on labels in sidebar | Phil Hughes | 2016-04-21 | 1 | -2/+3 |
| | | | |||||
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce | Rémy Coutable | 2016-04-21 | 2 | -46/+29 |
| |\ \ | |||||
| | * \ | Merge branch 'label-dropdown-fix' into 'master' | Jacob Schatz | 2016-04-21 | 2 | -46/+29 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "create label" functionality on label dropdown **Issue sidebar**  **Issues page**  See merge request !3670 | ||||
| | | * \ | Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fix | Alfredo Sumaran | 2016-04-20 | 14 | -118/+290 |
| | | |\ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'origin/master' into label-dropdown-fix | Alfredo Sumaran | 2016-04-20 | 15 | -123/+224 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml | ||||
| | | * | | | | Add is-link attribute to know if a menu item should not be stopped | Alfredo Sumaran | 2016-04-18 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Remove $parent | Alfredo Sumaran | 2016-04-18 | 1 | -6/+5 |
| | | | | | | | |||||
| | | * | | | | Fix create label functionality | Alfredo Sumaran | 2016-04-15 | 1 | -41/+25 |
| | | | | | | | |||||
| | | * | | | | Fix Label dropdown and organize code | Alfredo Sumaran | 2016-04-15 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/labels_select.js.coffee | ||||
| | | * | | | | Restore broken code | Alfredo Sumaran | 2016-04-15 | 1 | -9/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Rémy Coutable | 2016-04-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| | * | | | | | Merge branch 'issue_15434' into 'master' | Jacob Schatz | 2016-04-21 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes XSS injection REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434 **Without the fix**  **With the fix**  See merge request !1952 | ||||
| | | * | | | | | Remove unused param | Alfredo Sumaran | 2016-04-21 | 1 | -1/+1 |
| | | | |_|/ / | | |/| | | | |||||
| * | | | | | | Merge branch 'diff-link-fix' into 'master' | Jacob Schatz | 2016-04-21 | 1 | -6/+6 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff highlight fixes This fixes a couple of issues with linking/highlight diff lines: - Fixed issue with lines not being selectable when expanding diff - Fixed issue with incorrect line being highlighted if line is in discussion view See merge request !3725 | ||||
| | * | | | | | Fixed issue when scrolling to element and there is an expander | Phil Hughes | 2016-04-20 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Fixed issue with incorrect line being highlighted if line is in discussion view | Phil Hughes | 2016-04-20 | 1 | -4/+4 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Revert "Merge branch 'sentry-js' into 'master' " | Jacob Schatz | 2016-04-21 | 2 | -45/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0f309794e78243b1ee16ba6f1451dbb0752956c5, reversing changes made to 1e596fef1c42a1dd925636c48fea01be444dc3ab. | ||||
| * | | | | | Merge branch 'issue_14678' into 'master' | Jacob Schatz | 2016-04-20 | 1 | -1/+42 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Refresh page according remaining todos Fixes #14678 See merge request !3428 | ||||
| | * | | | | Use Turbolinks to redirectissue_14678 | Alfredo Sumaran | 2016-04-18 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Move declarations | Alfredo Sumaran | 2016-04-13 | 1 | -4/+3 |
| | | | | | | |||||
| | * | | | | Reutilize existing method to update param value | Alfredo Sumaran | 2016-04-11 | 1 | -12/+3 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into issue_14678 | Alfredo Sumaran | 2016-04-11 | 8 | -17/+131 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/todos.js.coffee | ||||
| | * \ \ \ \ | Merge branch 'master' into issue_14678 | Alfredo Sumaran | 2016-04-07 | 14 | -131/+648 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Get pagination options form the view | Alfredo Sumaran | 2016-04-01 | 1 | -9/+18 |
| | | | | | | | | |||||
| | * | | | | | | Expose todos_per_page variable | Alfredo Sumaran | 2016-03-30 | 1 | -3/+2 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into issue_14678 | Alfredo Sumaran | 2016-03-30 | 9 | -101/+460 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/todos.js.coffee | ||||
| | * | | | | | | | typo | Alfredo Sumaran | 2016-03-28 | 1 | -6/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Refresh page according remaining todos | Alfredo Sumaran | 2016-03-28 | 1 | -0/+43 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'due-date-frontend' into 'master' | Robert Speicher | 2016-04-20 | 2 | -1/+64 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add due date to issues Closes: #12709 See merge request !3614 | ||||
| | * | | | | | | | | replace hyphens to commas when converting date | Phil Hughes | 2016-04-20 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed date issue with timezones | Phil Hughes | 2016-04-20 | 1 | -1/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed buttons instead clicking date sets it | Phil Hughes | 2016-04-20 | 2 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with dropdown not being toggleable again | ||||
| | * | | | | | | | | Updates sidebar value | Phil Hughes | 2016-04-20 | 1 | -0/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed issue with bootstrap dropdown closing the calendar | Phil Hughes | 2016-04-20 | 1 | -0/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed issue with selectbox not hiding | Phil Hughes | 2016-04-20 | 1 | -1/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Posts the due date through AJAX | Phil Hughes | 2016-04-20 | 1 | -0/+48 |
| | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'sentry-js' into 'master' | Robert Speicher | 2016-04-20 | 2 | -0/+45 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Sentry logging for JavaScript errors Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12675 See merge request !3795 | ||||
| | * | | | | | | | place the sentry config into a new file, and some changessentry-js | Arinde Eniola | 2016-04-19 | 2 | -43/+44 |
| | | | | | | | | | |||||
| | * | | | | | | | some changes and add item to changelog | Arinde Eniola | 2016-04-19 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | add some configs | Arinde Eniola | 2016-04-18 | 1 | -2/+42 |
| | | | | | | | | | |||||
| | * | | | | | | | Make unminified Raven available. | Jacob Schatz | 2016-04-18 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the correct sentry dsn. | ||||
| | * | | | | | | | Add sentry logger to GitLab | Jacob Schatz | 2016-04-18 | 1 | -0/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'multi-filter-labels' into 'master' | Jacob Schatz | 2016-04-20 | 10 | -117/+181 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutliple label filter Fixes #989 See merge request !3438 | ||||
| | * | | | | | | | Correctly checks for undefined in coffeescript :see_no_evil:multi-filter-labels | Phil Hughes | 2016-04-20 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Any label & no label out weigh other labels - these two will clear ↵ | Phil Hughes | 2016-04-20 | 2 | -10/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously selected labels Fixed issue with no label not working correctly | ||||
| | * | | | | | | | Label text color comes from JSON | Phil Hughes | 2016-04-20 | 7 | -122/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created issuable singleton to house the filtering | ||||
| | * | | | | | | | get the multi filter labels feature to work on merge request, also escape ↵ | Arinde Eniola | 2016-04-20 | 3 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | characters in the templates to prevent xss attack | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |