summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-012-2/+18
| | | | |
| * | | | Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-copRémy Coutable2017-06-021-8/+8
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Expose avatar URL for groupsAlfredo Sumaran2017-06-061-1/+1
|/ / /
* | | Show current user immediately in issuable filtersWinnie Hellmann2017-06-021-5/+15
| | |
* | | Fix replying to a commit discussion displayed in the context of an MRDouwe Maan2017-06-011-1/+1
|/ /
* | Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-011-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments in discussion Closes #32353 See merge request !11802
| * | Fix: A diff comment on a change at last line of a file shows as two comments ↵Valery Sizov2017-05-311-2/+2
| | | | | | | | | | | | in discussion
* | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-012-13/+9
|\ \ \ | | | | | | | | | | | | | | | | Consistent diff and blob size limit names See merge request !11776
| * | | Consistent diff and blob size limit namesDouwe Maan2017-05-292-13/+9
| | | |
* | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-313-13/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename BuildsController to JobsController Closes #30699 See merge request !11407
| * \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-314-10/+37
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| * | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-267-25/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-182-1/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (31 commits) Remove 'no changes' entries from changelog Check if OLD is set when migrating issue assignees Fix data migration from trigger schedules Replace EFS section in AWS guide Add warning about AWS EFS and performance Consolidate opening text from about.gitlab.com and add active/passive note Fix invalid object reference in ee_compat_check script Fix Ordered Task List Items Add auxiliary viewer for README Update fe_guide testing.md Add auxiliary blob viewer for CHANGELOG Add spec for last commit info when browsing repository files Show last commit for current tree on tree page Use same last commit widget on project homepage and tree view Fix unassigned checkmark Add missing changelog for iPython notebook rendering feature Convert fa-history to svg; tweak alignment Get rid of pluck in app/services/members/authorized_destroy_service.rb Removes duplicate environment variable in documentation Fixed spacing issues in issue sidebar ...
| * | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-173-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename other URL generators admin_builds_path -> admin_jobs_path Fix tests and more renaming Fix more tests Also change build_id to job_id in the controller
* | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-311-0/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue inline editing Closes #24873 See merge request !11322
| * \ \ \ \ \ \ Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-305-30/+38
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | fixed issuable templates dropdown not showingPhil Hughes2017-05-251-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-258-10/+50
| |\ \ \ \ \ \ \
| * | | | | | | | fixed bug with can? check when user is not logged inPhil Hughes2017-05-241-1/+1
| | | | | | | | |
| * | | | | | | | Changed all data to come through the JSON script elementPhil Hughes2017-05-241-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Fixed up the template dropdown to correctly workPhil Hughes2017-05-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-161-0/+4
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Added description template selectorPhil Hughes2017-05-151-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]