summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Fix avatar images in pipeline emailsfix-email-avatarsSean McGivern2017-06-201-2/+2
|
* Stop showing task status if no tasks are presentPhil Hughes2017-06-201-3/+4
| | | | | | | | | | | Previously the task status would be visible even if there where no tasks in the description. This fixes that by changing the regex to check for tasks without 0. This also fixes a bug where update the description inline would not update the task status text on screen. Closes #33880
* Don't display comment on unchanged line on both sides in parallel diffDouwe Maan2017-06-191-2/+2
|
* [#27697] Make the arrow icons consistent in dropdownTM Lee2017-06-191-8/+15
|
* Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master'Sean McGivern2017-06-161-2/+2
|\ | | | | | | | | | | | | Rename "Slash commands" to "Quick actions" Closes #27070 See merge request !11811
| * Rename "Slash commands" to "Quick actions"Eric Eastwood2017-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070 Deprecate "chat commands" in favor of "slash commands" We looked for things like: - `slash commmand` - `slash_command` - `slash-command` - `SlashCommand`
* | Merge branch 'bvl-missing-translations' into 'master'Douwe Maan2017-06-162-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Missing translations for the project & repository pages. Closes #33420 See merge request !12052
| * | Update Spanish translations after code reviewRuben Davila2017-06-151-1/+1
| | |
| * | Use the same time format as beforeBob Van Landuyt2017-06-151-1/+1
| | |
| * | Translate time tooltips.Bob Van Landuyt2017-06-151-2/+2
| |/ | | | | | | Let the backend do the translation.
* | Merge branch 'feature/unify-email-layouts' into 'master'Robert Speicher2017-06-151-0/+13
|\ \ | | | | | | | | | | | | Unify email layouts: devise emails See merge request !10483
| * | add view helper for mail headingAlexis Reigel2017-06-131-0/+13
| | |
* | | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-151-1/+1
| | |
* | | Merge branch '23998-blame-age-map' into 'master'Annabel Dunstone Gray2017-06-151-0/+21
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Add age color mapping to blame view Closes #23998 See merge request !7198
| * | Add blame view age mapJeff Stubler2017-06-141-0/+21
| |/
* | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-141-0/+4
|\ \ | | | | | | | | | | | | Allow more customization to Help landing page See merge request !11878
| * | Help landing page customizationsRobin Bobbitt2017-06-141-0/+4
| |/
* | Implement diff viewersDouwe Maan2017-06-141-0/+24
| |
* | Allow to access pipelines even if they are disabled, but only present jobs ↵Kamil Trzcinski2017-06-131-1/+4
|/ | | | and commit statuses without giving ability to access them
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-121-0/+1
|\ | | | | | | | | | | | | Add an optional performance bar to view performance metrics for the current page Closes #29010 See merge request !11439
| * Improve UI of the performance barRémy Coutable2017-06-091-0/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'operau2f' into 'master'Rémy Coutable2017-06-121-1/+1
|\ \ | | | | | | | | | | | | Fix FIDO U2F for Opera browser (based on !10118) See merge request !12082
| * | Enable FIDO U2F on Opera browser, see http://caniuse.com/#feat=u2fJakub Kramarz2017-06-111-1/+1
| | |
* | | Merge branch 'rs-simplify-todo-count-spec' into 'master'Rémy Coutable2017-06-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Test todos_count_format helper at the correct level to improve speed See merge request !12075
| * | | Test todos_count_format helper at the correct level to improve speedrs-simplify-todo-count-specRobert Speicher2017-06-091-1/+1
| | |/ | |/| | | | | | | | | | Instead of an integration test that creates 101 Todo records to test a simple view helper, just unit test the helper.
* | | Changes default text to "Unassigned"unassign-default-dropdown-stateJacob Schatz2017-06-111-1/+1
|/ / | | | | | | | | By changing this text the css will check for `toggle_text == default_label`. In this case they were not the same. Now they are and it will show the default label in gray.
* | Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'Sean McGivern2017-06-091-0/+6
|\ \ | |/ |/| | | | | | | | | Fixed dashboard milestone tabs not loading Closes #33477 See merge request !12023
| * Fixed dashboard milestone tabs not loadingdashboard-milestone-tabs-loading-asyncPhil Hughes2017-06-091-0/+6
| | | | | | | | Closes #33477
* | Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-086-47/+82
|\ \ | |/
| * Resolve "Jobs page scrollbar and centering"Filipa Lacerda2017-06-081-1/+1
| |
| * Translate project & repository pagesBob Van Landuyt2017-06-075-46/+81
| |
* | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0710-21/+79
|\ \ | |/
| * Added more actions and report as abuse to all notesLuke "Jared" Bennett2017-06-071-2/+6
| |
| * Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-0/+7
| |
| * Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-071-1/+1
| |\ | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| | * Support descriptions for snippetsJarka Kadlecova2017-05-311-1/+1
| | |
| * | Resolve "When changing project visibility setting, change other dropdowns ↵Mike Greiling2017-06-062-5/+9
| | | | | | | | | | | | automatically"
| * | Merge branch 'dz-fix-submodule-subgroup' into 'master'Douwe Maan2017-06-051-0/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix submodule link to then project under subgroup Closes gitlab-ee#2411 See merge request !11906
| | * | Fix submodule link to then project under subgroupDmitriy Zaporozhets2017-06-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change only last namespace in full path was extracted. It's fine unless you have a link to submodule under subgroups. In that case self_url? method returns false and link is processed as external. I could not find a proper regex to cover all cases and correctly extract full path to repository and instead used current instance host name to get correct path to namespace and project. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-052-3/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. See merge request !11478
| | * | | Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-021-1/+3
| | | | |
| | * | | Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-028-41/+60
| | |\ \ \ | | | | | | | | | | | | | | | | | | fix-realtime-edited-text-for-issues-9-3
| | * | | | Removed unneeded newline in issuables_helper_spec and removed unneeded ↵Luke "Jared" Bennett2017-06-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | updated_at_by variable in issuable_app_data
| | * | | | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-311-23/+23
| | | | | |
| | * | | | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-312-14/+12
| | | | | |
| | * | | | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-311-1/+1
| | | | | |
| | * | | | Fix helper methods returning wrong data types for vueLuke "Jared" Bennett2017-05-312-3/+7
| | | | | |
| | * | | | Move issuable_app_data to helperLuke "Jared" Bennett2017-05-311-0/+8
| | | | | |
| | * | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-312-1/+14
| | | |_|/ | | |/| |
| * | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-052-2/+18
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | ConvDev Index Closes #30469 See merge request !11377