summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Satisfy Rubocopworkhorse-helpersDouwe Maan2016-06-101-2/+2
|
* Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-10175-950/+2237
|\
| * Merge branch '18447-investigate-smtp-error' into 'master' Douwe Maan2016-06-101-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix failing `EmailOnPush` spec. Closes #18447 - This should fix CI on master /cc @smcgivern @ayufan @stanhu @pacoguzman See merge request !4582
| | * Fix failing `EmailOnPush` spec.Timothy Andrew2016-06-101-2/+2
| |/
| * Merge branch 'award-emoji-fixes' into 'master' Jacob Schatz2016-06-096-19/+17
| |\ | | | | | | | | | | | | | | | | | | Award emoji fixes Fixes #18357 #18325 and #18424 See merge request !4550
| | * Minor MR comment fixes.Fatih Acet2016-06-101-6/+6
| | | | | | | | | | | | | | | | | | yes -> true no -> false . frequent -> .frequent-emojis
| | * Ignore frequent emojis in search.award-emoji-fixesFatih Acet2016-06-091-2/+2
| | |
| | * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0914-101/+156
| | |\
| | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-092-18/+99
| | |\ \
| | * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixesFatih Acet2016-06-0933-151/+309
| | |\ \ \
| | * | | | Move award_menu_url variable into gon object.Fatih Acet2016-06-094-11/+8
| | | | | |
| | * | | | Render frequent emoji block once.Fatih Acet2016-06-091-1/+3
| | | | | |
| | * | | | Instantiate awardsHandler in application main script.Fatih Acet2016-06-092-2/+1
| | | | | |
| * | | | | Update CHANGELOG for 8.8.4 and 8.8.5Robert Speicher2016-06-091-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge branch 'fix-issue-15259-postgresql' into 'master' Robert Speicher2016-06-091-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly quote table name in Rake task for MySQL and PostgreSQL compatibility !4318 broke the gitlab:db:drop_tables functionality for PostgreSQL. Closes #15259 See merge request !4577
| | * | | | | Properly quote table name in Rake task for MySQL and PostgreSQL compatibilityfix-issue-15259-postgresqlStan Hu2016-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !4318 broke the gitlab:db:drop_tables functionality for PostgreSQL. Closes #15259
| * | | | | | Merge branch 'milestone-tooltip' into 'master' Jacob Schatz2016-06-096-6/+44
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add milestone expire date to the right sidebar ## What does this MR do? Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed. ## Are there points in the code the reviewer needs to double check? `common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17355 ## Screencast ![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif) See merge request !4448
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipmilestone-tooltipFatih Acet2016-06-0916-119/+255
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0954-182/+542
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-0949-85/+224
| | |\ \ \ \ \
| | * | | | | | Fixes for MR comments.Fatih Acet2016-06-094-5/+5
| | | | | | | |
| | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-08244-2438/+5858
| | |\ \ \ \ \ \
| | * | | | | | | Copy changes for milestone due dates.Fatih Acet2016-06-083-3/+3
| | | | | | | | |
| | * | | | | | | Revert milestone_remaining_days helper.Fatih Acet2016-06-081-10/+5
| | | | | | | | |
| | * | | | | | | Use title attribute instead of data-original-title.Fatih Acet2016-06-082-4/+4
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltipFatih Acet2016-06-06199-1196/+4637
| | |\ \ \ \ \ \ \
| | * | | | | | | | Favor the ternary operator. :police_car:Fatih Acet2016-06-061-1/+1
| | | | | | | | | |
| | * | | | | | | | Update CHANGELOG.Fatih Acet2016-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add milestone expire date to the right sidebar.
| | * | | | | | | | Show milestone remaining tooltip in right sidebar.Fatih Acet2016-06-033-9/+27
| | | | | | | | | |
| | * | | | | | | | Added a new common util called $.timefor.Fatih Acet2016-06-031-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will use $.timeago behind the scene and it does the opposite of what $.timeago does. $.timefor("Thu Jun 05 2016 23:40:39 GMT+0300 (EEST)") will return "3 days remaining".
| * | | | | | | | | Merge branch 'autocomplete-comment-fix' into 'master' Jacob Schatz2016-06-091-1/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks for undefined when inserting autocomplete into textarea ## What does this MR do? Correctly checks for undefined before inserting anything into the textarea when using autocomplete. This happens because the loading indicator tries to insert `@undefined` which we dont want to insert. See merge request !4561
| | * | | | | | | | | Checks based on whether data is loaded not undefinedPhil Hughes2016-06-091-1/+4
| | | | | | | | | | |
| | * | | | | | | | | Checks for undefined when inserting autocomplete into textareaPhil Hughes2016-06-091-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'fix_issue_15259' into 'master' Stan Hu2016-06-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug with SQL syntax error during backup restoration ## What does this MR do? It properly escapes the table name in the `DROP TABLE IF EXISTS ...` statement used during restore of a backup. ## Are there points in the code the reviewer needs to double check? Please check compatibility with PostgreSQL ## Why was this MR needed? Fix an issue with backups can not be restored if MySQL is used as database for GitLab. ## What are the relevant issue numbers? #15259 ## Screenshots (if relevant) - See merge request !4318
| | * | | | | | | | | Fix bug with SQL syntax error during backup restorationDaniel Beyer2016-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes #15259
| * | | | | | | | | | Merge branch 'fix-empty-user-projects-snippets-list' into 'master' Jacob Schatz2016-06-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix empty user projects snippets list ## What are the relevant issue numbers? Closes #17952 #17816 and #17737 cc: @lbennett @jschatz1 See merge request !4532
| | * | | | | | | | | | fix empty user projects snippets listBartholomew2016-06-081-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'dz-improve-ui-consistency-2' into 'master' Jacob Schatz2016-06-0917-82/+71
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ui consistency. Part 2 * Use responsive top-area on project branches and tags pages * Use default button size in the content list controls * Improve button margin for btn-grouped css class For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 See merge request !4536
| | * | | | | | | | | | | Remove icons from button on wiki pages. Also consistent padding between ↵dz-improve-ui-consistency-2Dmitriy Zaporozhets2016-06-086-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buttons there Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | | Improve buttons size and paddings in the listsDmitriy Zaporozhets2016-06-085-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | | Use responsive top-area on project branches and tags pagesDmitriy Zaporozhets2016-06-082-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | | Use default button size in the content list controlsDmitriy Zaporozhets2016-06-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | | | | | Improve button margin for btn-grouped css classDmitriy Zaporozhets2016-06-084-30/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Merge branch 'due-date-field-ux-improv' into 'master' Jacob Schatz2016-06-096-24/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved the UX of issue & milestone date picker ## What does this MR do? Improves the UX of the date picker on issue form & milestone form. ## What are the relevant issue numbers? Closes #18198 ## Screenshots (if relevant) ### Issues ![Screen_Shot_2016-06-06_at_09.28.29](/uploads/d9c192dff0d8076adc3ed6f005ea3790/Screen_Shot_2016-06-06_at_09.28.29.png) ### Project milestones ![Screen_Shot_2016-06-06_at_09.28.18](/uploads/2d03d72791c5fc6badfadb975a85af2b/Screen_Shot_2016-06-06_at_09.28.18.png) ### Group milestones ![Screen_Shot_2016-06-06_at_09.28.05](/uploads/0f28532396a16e6fd48ddea784ca28e3/Screen_Shot_2016-06-06_at_09.28.05.png) See merge request !4485
| | * | | | | | | | | | | | Fixed testsPhil Hughes2016-06-091-5/+7
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | CHANGELOGPhil Hughes2016-06-091-0/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Improved the UX of issue & milestone date pickerPhil Hughes2016-06-094-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18198
| * | | | | | | | | | | | | Merge branch 'remove-chart' into 'master' Jacob Schatz2016-06-092-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only load Chart.js when necessary. Only load Chart.js where it's used, namely the Graphs section. Follow up on !4394. cc: @jschatz1 See merge request !4516
| | * | | | | | | | | | | | | Only load Chart.js when necessary.Connor Shea2016-06-072-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'issue_17607' into 'master' Jacob Schatz2016-06-097-5/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix local timeago on user dashboard ## What does this MR do? Fixes incorrect date times on tooltips on the dashboard page ## Are there points in the code the reviewer needs to double check? Yes, The tooltip has to be recreated again because we needed a custom CSS classname in order to fix the date being splitted into two lines. ## Why was this MR needed? Because the datetimes were incorrect we have to have the same format for .timeago() instances. ## What are the relevant issue numbers? #17607 ## Screenshots (if relevant) **Before** <img src="/uploads/f40cd58e8086d9675262e98a1fe57885/Screen_Shot_2016-05-24_at_7.23.25_PM.png" width="705"> **After** <img src="/uploads/bd48046ef11659cc742f827b3404fbcd/Screen_Shot_2016-05-24_at_7.22.29_PM.png" width="704"> See merge request !4285