summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* allow application.js to require other scripts which start with application*Mike Greiling2017-02-021-1/+1
|
* Merge branch 'master' into webpackMike Greiling2017-02-0239-86/+168
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (63 commits) Use `add_$role` helper in snippets specs removes old css class from everywhere Fixes broken build: Use jquery to get the element position in the page Check public snippets for spam Keep snippet visibility on error Update pipeline and commit URL and text on CI status change Support non-ASCII characters in GFM autocomplete Active tense test coverage Fix filtered search manager spec teaspoon error Reduce the number of loops that Cycle Analytics specs use Remove unnecessary returns / unset variables from the CoffeeScript -> JS conversion. update spec Change the reply shortcut to focus the field even without a selection. use destroy_all Remove settings cog from within admin scroll tabs; keep links centered add changelog remove old project members from project add spec replicating validation error Improve styling of the new issue message Don't capitalize environment name in show page ...
| * Merge branch '27291-unify-mr-diff-file-buttons' into 'master' Annabel Dunstone Gray2017-02-025-9/+5
| |\ | | | | | | | | | | | | | | | | | | unifies mr diff file button style Closes #27291 See merge request !8874
| | * removes old css class from everywhere27291-unify-mr-diff-file-buttonsNur Rony2017-02-023-7/+3
| | |
| | * unifies mr diff file button styleNur Rony2017-01-302-2/+2
| | |
| * | Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master'Douwe Maan2017-02-021-17/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add ability to define a coverage regex in the .gitlab-ci.yml Closes #20428 See merge request !7447
| | * | Be more lenient on build coverage value updates and fix specsLeandro Camargo2017-01-251-1/+1
| | | |
| | * | Make more code improvements around the '/' stripping logicLeandro Camargo2017-01-251-22/+13
| | | |
| | * | Improve/polish code logic for some Ci::Build methodsLeandro Camargo2017-01-251-4/+4
| | | |
| | * | Force coverage value to always be surrounded by '/'Leandro Camargo2017-01-251-3/+7
| | | |
| | * | Comply to more requirements and requests made in the code reviewLeandro Camargo2017-01-251-1/+1
| | | |
| | * | Comply to requests made in the review and adjust to the Entry/Node changesLeandro Camargo2017-01-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit: * Turns `coverage_regex` into `coverage` entry in yml file * Fixes smaller requests from code reviewers for the previous commit * This commit is temporary (will be squashed afterwards) This commit does not (further commits will do though): * Add global `coverage` entry handling in yml file as suggested by Grzegorz * Add specs * Create changelog * Create docs
| | * | Add ability to define a coverage regex in the .gitlab-ci.ymlLeandro Camargo2017-01-251-2/+5
| | | | | | | | | | | | | | | | * Instead of using the proposed `coverage` key, this expects `coverage_regex`
| * | | Merge branch ↵Alfredo Sumaran2017-02-024-3/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggered' into 'master' Update pipeline and commit URL and text on CI status change Closes #25811 See merge request !8351
| | * | | Update pipeline and commit URL and text on CI status change25811-pipeline-number-and-url-do-not-update-when-new-pipeline-is-triggeredSam Rose2017-02-014-3/+28
| | | | |
| * | | | Merge branch 'snippet-spam' into 'master' Rémy Coutable2017-02-0215-19/+57
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippet spam Closes #26276 See merge request !8911
| | * | | | Check public snippets for spamSean McGivern2017-02-029-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the same spam checks to public snippets (either personal snippets that are public, or public snippets on public projects) as to issues on public projects.
| | * | | | Keep snippet visibility on errorSean McGivern2017-02-027-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a snippet is submitted, but there's an error, we didn't keep the visibility level. As the default is private, this means that submitting a public snippet that failed would then fall back to being a private snippet.
| * | | | | Merge branch 'fix-depr-warn' into 'master' Rémy Coutable2017-02-021-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolve deprecation warnings Closes #27423 See merge request !8855
| | * | | | | resolve deprecation warningsAdam Pahlevi2017-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don’t pass AR object, use the ID to avoid depr warning pass in the id instead of AR object to specs for `ProjectDestroyWorker`
| * | | | | | Merge branch ↵Filipa Lacerda2017-02-021-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '27067-mention-user-dropdown-does-not-suggest-by-non-ascii-characters-in-name' into 'master' Resolve "Mention @user dropdown does not suggest by non-ASCII characters in name" Closes #27067 See merge request !8729
| | * | | | | Support non-ASCII characters in GFM autocomplete27067-mention-user-dropdown-does-not-suggest-by-non-ascii-characters-in-namesamrose32017-02-011-2/+2
| | | | | | |
| * | | | | | Merge branch 'empty-selection-reply-shortcut' into 'master' Clement Ho2017-02-012-3/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the reply shortcut to focus the field even without a selection. See merge request !8873
| | * | | | | | Change the reply shortcut to focus the field even without a selection.Brian Hall2017-01-312-3/+7
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch '27089-26860-27151-fix-discussion-note-permalink-collapsed' ↵Filipa Lacerda2017-02-011-10/+16
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix permalink discussion note being collapsed Closes #26860, #27089, and #27151 See merge request !8773
| | * | | | | Fix permalink discussion note being collapsed27089-26860-27151-fix-discussion-note-permalink-collapsedEric Eastwood2017-01-261-10/+16
| | | | | | |
| * | | | | | Merge branch 'fix-filtering-username-with-multiple-words' into 'master' Filipa Lacerda2017-02-011-1/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtering usernames with multiple words Closes #27404 See merge request !8851
| | * | | | | | Fix filtering usernames with multiple wordsfix-filtering-username-with-multiple-wordsClement Ho2017-01-271-1/+8
| | | | | | | |
| * | | | | | | Merge branch '27494-environment-list-column-headers' into 'master' Annabel Dunstone Gray2017-02-012-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited the column header for the environments list from created to updated and a… Closes #27494 See merge request !8904
| | * | | | | | | Edited the column header for the environments list from created to updated ↵27494-environment-list-column-headersdimitrieh2017-01-312-2/+2
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | and added created to environments detail page colum header titles
| * | | | | | | Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-011-9/+5
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format chat messages Closes #24917 and #25746 See merge request !8528
| | * | | | | | Fix testsZ.J. van de Weg2017-01-301-6/+2
| | | | | | | |
| | * | | | | | Chat Commands have presentersZ.J. van de Weg2017-01-301-10/+10
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | This improves the styling and readability of the code. This is supported by both Mattermost and Slack.
| * | | | | | Merge branch '27484-environment-show-name' into 'master' Fatih Acet2017-01-311-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't capitalize environment name in show page Closes #27484 See merge request !8902
| | * | | | | | Don't capitalize environment name in show page27484-environment-show-nameFilipa Lacerda2017-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upate test to match the new behavior
| * | | | | | | Merge branch '19164-mobile-settings' into 'master' Annabel Dunstone Gray2017-01-312-5/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19164 Add settings dropdown to mobile screens Closes #19164 See merge request !8896
| | * | | | | | | Remove settings cog from within admin scroll tabs; keep links centered19164-mobile-settingsAnnabel Dunstone Gray2017-01-312-2/+1
| | | | | | | | |
| | * | | | | | | 19164 Add settings dropdown to mobile screenstauriedavis2017-01-301-4/+8
| | | | | | | | |
| * | | | | | | | Merge branch '26982-improve-pipeline-status-icon-linking-in-widgets' into ↵Annabel Dunstone Gray2017-01-314-5/+13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve pipeline status icon linking in widgets Closes #26982 See merge request !8705
| | * | | | | | | | Link to pipeline page from commit widget26982-improve-pipeline-status-icon-linking-in-widgetsAnnabel Dunstone Gray2017-01-301-2/+2
| | | | | | | | | |
| | * | | | | | | | Remove underline style for icon hoverAnnabel Dunstone Gray2017-01-302-1/+7
| | | | | | | | | |
| | * | | | | | | | Improve pipeline status icon linking in widgetsdimitrieh2017-01-233-4/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-3170-321/+550
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (83 commits) Fix small typo on new branch button spec Abillity to promote project labels to group labels Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. cop for gem fetched from a git source Add CHANGELOG entry Remove new branch button for confidential issues Remove flash warning from login page add complete changelog Add project ID index to `project_authorizations` table to optimize queries Fix disable storing of sensitive information when importing a new repo Fix notification when global=disabled, group=watch Ensure rake is called within the correct bundle context Fix 8.16.0 release date. Improve search within group logic Add changelog item about new attributes in group api Update group api doc with full_name and full_path attributes Add tests for nested groups in search service and search helper ...
| * | | | | | | | | Merge branch 'correct-gitlab-host-references' into 'master' Achilleas Pipinellis2017-01-314-6/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected docs href's See merge request !8527
| | * | | | | | | | | Corrected docs href'scorrect-gitlab-host-referencesLuke "Jared" Bennett2017-01-304-6/+5
| | | | | | | | | | |
| * | | | | | | | | | Merge branch '23767-disable-storing-of-sensitive-information' into 'master' Filipa Lacerda2017-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix disable storing of sensitive information when importing a new repo Closes #23767 See merge request !8885
| | * | | | | | | | | | Fix disable storing of sensitive information when importing a new repo23767-disable-storing-of-sensitive-informationClement Ho2017-01-301-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch '395-fix-notification-when-group-set-to-watch' into 'master'Sean McGivern2017-01-311-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix notification when group set to watch Closes #395 See merge request !8883
| | * | | | | | | | | | | Fix notification when global=disabled, group=watch395-fix-notification-when-group-set-to-watchamaia2017-01-301-4/+4
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | Merge branch 'fix/27479' into 'master' Sean McGivern2017-01-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove new branch button for confidential issues Closes #27479 See merge request !8894