summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Session stored globally per requestjej/session-stored-globalyJames Edwards-Jones2019-05-021-0/+5
| | | | | - This can be accessed with Session.current and is restored after. - Data can be stored under a key with NamespacedSessionStore
* Merge branch '60687-enviro-dropdown' into 'master'Fatih Acet2019-04-242-1/+2
|\ | | | | | | | | | | | | Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586
| * Fix Metrics environments dropdown60687-enviro-dropdownSimon Knox2019-04-242-1/+2
| | | | | | | | Also bring back EE dashboard component
* | Merge branch 'fix-api-ide-relative-url-root' into 'master'Fatih Acet2019-04-243-10/+9
|\ \ | | | | | | | | | | | | Fix API and IDE path with `/` relative_url_root See merge request gitlab-org/gitlab-ce!27635
| * | Fix API and IDE path with `/` relative_url_rootPaul Slaughter2019-04-243-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | **Why?** Previously we simply concatenated our paths, which led to requesting `//api/v4/...` and obviously failed. The BE supports a relative_url_root of `/`. It's a bug that the FE does not.
* | | Merge branch '60387-use-icons-in-user-popovers' into 'master'Tim Zallmann2019-04-242-4/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show category icons in user popover Closes #60387 See merge request gitlab-org/gitlab-ce!27254
| * | | Show category icons in user popoverKushal Pandya2019-04-222-4/+21
| | | | | | | | | | | | | | | | Show bio, organization and location icons within user popover.
* | | | Merge branch 'i18n-extract-app/views/projects-forks' into 'master'Clement Ho2019-04-243-25/+18
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | i18n: externalize strings from 'app/views/projects/forks' See merge request gitlab-org/gitlab-ce!27497
| * | | [CE] i18n: externalize strings from 'app/views/projects/forks'i18n-extract-app/views/projects-forksTao Wang2019-04-233-25/+18
| | |/ | |/| | | | | | | | | | Signed-off-by: Tao Wang <twang2218@gmail.com> Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Backport EE cache updateFelipe Artur2019-04-241-1/+1
| | |
* | | Merge branch '54656-500-error-on-save-of-general-pipeline-settings-timeout' ↵Stan Hu2019-04-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "500 error on save of general pipeline settings timeout" Closes gitlab-ee#11281 See merge request gitlab-org/gitlab-ce!27416
| * | | Redirect to settings page on invalid updateMatija Čupić2019-04-241-1/+1
| | | |
* | | | Merge branch 'add-ci-variable-protected-ref' into 'master'Grzegorz Bizon2019-04-241-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add CI variable CI_REF_PROTECTED See merge request gitlab-org/gitlab-ce!26716
| * | | | Make sure that CI_COMMIT_REF_PROTECTED is a boolJason van den Hurk2019-04-181-1/+1
| | | | |
| * | | | Change CI_REF_PROTECTED variable to CI_COMMIT_REF_PROTECTEDJason van den Hurk2019-04-101-1/+1
| | | | |
| * | | | Added the CI_REF_PROTECTED variable to the Gitlab runnerJason van den Hurk2019-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable shows if the branch the runner is executing is protected or not. References: #50909
* | | | | Resolve "Merge Request Popover is not working on the To Do page"Sam Bigelow2019-04-242-8/+10
| | | | |
* | | | | Move EE differences for `ready_to_merge.vue`Natalia Tepluhina2019-04-242-9/+15
| | | | |
* | | | | Merge branch 'sh-disable-internal-ids-available-check' into 'master'Sean McGivern2019-04-241-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use internal ID tables in development and production Closes #60718 See merge request gitlab-org/gitlab-ce!27544
| * | | | | Always use internal ID tables in development and productionsh-disable-internal-ids-available-checkStan Hu2019-04-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid quiet failures that cause consistency errors in the database, we should now assume that the internal_ids table is available since we've had this table for close to a year. For tests that have migrations, we make this check thread-safe via SafeRequestStore. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60718
* | | | | | Remove "You are already signed in" bannerIllya Klymov2019-04-242-7/+12
| |_|/ / / |/| | | |
* | | | | Merge branch '10096-gfm-autocomplete-ce' into 'master'Kushal Pandya2019-04-245-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move EE specific GfmAutocomplete code to EE file See merge request gitlab-org/gitlab-ce!27611
| * | | | | Move EE specific GfmAutocomplete code to EE file10096-gfm-autocomplete-ceRajat Jain2019-04-245-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor GfmAutocomplete and create a new EE counterpart which is referenced through `ee_else_ce`
* | | | | | Merge branch '10504-single-codebase-ce' into 'master'Sean McGivern2019-04-242-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Epics in issuable list when EE See merge request gitlab-org/gitlab-ce!27545
| * | | | | | Add Epics in issuable list when EERajat Jain2019-04-242-3/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Create a method in LabelsHelper which returns the correct list of `issuable_types` to the view.
* | | | | | Merge branch 'ide-create-commit-action-types-constant' into 'master'Phil Hughes2019-04-242-4/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create constants for IDE commit action values See merge request gitlab-org/gitlab-ce!27613
| * | | | | | Create constants for IDE commit action valuesPaul Slaughter2019-04-242-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** These values will be used to help build the mirroring diff. It is helpful keeping it controlled in a constant. **Links:** - https://gitlab.com/gitlab-org/gitlab-ee/issues/10232 - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11478
* | | | | | | Use Gitea logo for importerMatti R2019-04-244-5/+6
| | | | | | |
* | | | | | | CE backport: "Move EE differences forDonald Cook2019-04-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | app/views/projects/issues/show.html.haml"
* | | | | | | Merge branch '59831-related-items-css-cleanup-ce' into 'master'Filipa Lacerda2019-04-242-95/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Remove related items CSS properties and add utility classes See merge request gitlab-org/gitlab-ce!27583
| * | | | | | Remove related items CSS properties and add utility classes59831-related-items-css-cleanup-ceAnnabel Dunstone Gray2019-04-232-95/+24
| | | | | | |
* | | | | | | Externalize left sidebar stringsVictor Wu2019-04-241-2/+2
| | | | | | |
* | | | | | | Merge branch '60730-service-response' into 'master'Dmitriy Zaporozhets2019-04-243-17/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce ServiceResponse to wrap around response Closes #60730 See merge request gitlab-org/gitlab-ce!27516
| * | | | | | | Introduce ServiceResponse to wrap around responseLin Jen-Shin2019-04-223-17/+46
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/60730
* | | | | | | Move scoped_label into label presenterJan Provaznik2019-04-2316-60/+81
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering a label we want to check 'scoped_label' feature availability on a project/group where label is being used. For this reason a label presenter is used in UI and information about context project/group is passed to this presenter.
* | | | | | Fix issue with list label text colorTucker Chapman2019-04-231-0/+1
| | | | | |
* | | | | | Merge branch 'upgrade-to-rails-5-1' into 'master'Rémy Coutable2019-04-2316-34/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rails to 5.1 See merge request gitlab-org/gitlab-ce!27480
| * | | | | | Remove use of deprecated methodsupgrade-to-rails-5-1Heinrich Lee Yu2019-04-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed after upstream refactor
| * | | | | | Upgrade Rails to 5.1.6.1Jasper Maes2019-04-2315-32/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Model.new.attributes now also returns encrypted attributes.
* | | | | | | Merge branch ↵Kamil Trzciński2019-04-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60569-timeline-entry-label-link-is-not-applying-the-filter-on-issues' into 'master' Adds `label_name` back as a scalar param in `IssuableFinder` Closes #60569 See merge request gitlab-org/gitlab-ce!27507
| * | | | | | | Add label_name as scalar param of IssuableFinder60569-timeline-entry-label-link-is-not-applying-the-filter-on-issuesHeinrich Lee Yu2019-04-231-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This was removed by a previous MR but broke some links
* | | | | | | Externalize some strings in issue page and new issue pageVictor Wu2019-04-232-6/+6
| | | | | | |
* | | | | | | Merge branch 'sh-avoid-fetching-temp-refs-within-project' into 'master'Douwe Maan2019-04-231-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create a temp reference for branch comparisons within project Closes #58315 See merge request gitlab-org/gitlab-ce!24038
| * | | | | | | Check that source and target branch existStan Hu2019-04-181-2/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the return value is consistent if the source and/or branch do not exist.
* | | | | | | Merge branch 'resolve-ee-ce-diff-of-noteable-discussion' into 'master'Phil Hughes2019-04-231-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve EE / CE diff of noteable_discussion See merge request gitlab-org/gitlab-ce!27562
| * | | | | | | Resolve EE / CE diff of noteable_discussionresolve-ee-ce-diff-of-noteable-discussionPaul Slaughter2019-04-221-1/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Revert "Increased page size to 100"Natalia Tepluhina2019-04-232-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2869a61f3b7aeb8b6d79c74332c93e32cec20caa.
* | | | | | | Merge branch '59514-uploading-images-base64' into 'master'Phil Hughes2019-04-236-7/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Web IDE uploading images shows base64 string" Closes #59514 See merge request gitlab-org/gitlab-ce!27471
| * | | | | | | Stores 'binary' and 'rawPath' attr after uploadDenys Mishunov2019-04-184-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When uploading a file, we need to flag binary files correspondingly so that it gets propagated all the way to RepoEditor as it decides on whether to show editor for this or that file or not (shouldHideEditor()) - rawPath needs to be propagate all the way to ContentViewer as well so that uploaded images could be rendered as a base64 image right away instead of raw base64 string
| * | | | | | | Always hides editor in Web IDE for binary filesDenys Mishunov2019-04-171-1/+1
| | | | | | | |
View Lorry Controller Status