summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'rs-add-title-to-emoji' into 'master' Dmitriy Zaporozhets2016-01-121-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add title attribute to Emojis in award picker See merge request !2378
| * | | | | | | | | | | | | | | Add title attribute to Emojis in award pickerrs-add-title-to-emojiRobert Speicher2016-01-111-3/+6
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Call clearInterval for the currentTimer if one existsRobert Speicher2016-01-111-0/+1
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents a double-click from causing the logo to sweep forever after a load completes.
* | | | | | | | | | | | | | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-112-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow subsequent validations in CI Linter Closes #5851 See merge request !2368
| * | | | | | | | | | | | | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-112-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #5851
* | | | | | | | | | | | | | Merge branch 'fix-ci-builds-for-tags' into 'master' Robert Speicher2016-01-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate builds when creating tag using web interface Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4296 See merge request !2366
| * | | | | | | | | | | | | Generate builds when creating tag using web interfacefix-ci-builds-for-tagsKamil Trzcinski2016-01-111-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-116-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of getting issues on group level For testing I used the URL http://localhost:3000/groups/gitlab-org/issues?milestone_title=8.1. Prior to these changes said URL would take about 10-12 seconds to load. By applying these changes the loading time has been reduced to roughly 2-3 seconds. There's still some stuff going on in some views that I have to look at, resolving those changes might reduce the loading time a bit more. I also still have to check if I didn't break too many tests. Fixes: gitlab-org/gitlab-ce#3707 gitlab-org/gitlab-ce#4071 See merge request !2318
| * | | | | | | | | | | | | Removed ORDER BY in "of_group" scopesgroup-issues-sortingYorick Peterse2016-01-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These scopes don't care about the order. Removing the explicit "ORDER BY" can speed up the queries by a little bit.
| * | | | | | | | | | | | | Drop projects order in IssuableFinderYorick Peterse2016-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When grabbing the projects to filter issues by we don't care about the order they're returned in. By removing the ORDER BY the resulting query can be quite a bit faster.
| * | | | | | | | | | | | | Don't pluck IDs when getting issues/MRs per groupYorick Peterse2016-01-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces plucking of IDs with a sub-query, saving the overhead of loading the data in Ruby and then mapping the rows to an Array of IDs. This also scales much better when dealing with a large amount of IDs that would be involved.
| * | | | | | | | | | | | | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-073-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting by "id" has the same effect as sorting by created_at while performing far better and without the need of an extra index (in case one wanted to speed up sorting by "created_at"). Sorting by "Recently updated" still uses the physical "updated_at" column as there's no way to use the "id" column for this instead.
* | | | | | | | | | | | | | Merge branch 'rs-woff-fonts' into 'master' Dmitriy Zaporozhets2016-01-1132-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use WOFF versions of SourceSansPro See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023 See merge request !2357
| * | | | | | | | | | | | | Use WOFF versions of SourceSansPrors-woff-fontsRobert Speicher2016-01-0932-7/+8
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023
* | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-113-107/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs-zenmode-cleanup' into 'master' Douwe Maan2016-01-113-107/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ZenMode - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling. See merge request !2354
| | * | | | | | | | | | | | Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-083-107/+105
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling.
* | | | | | | | | | | | | Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erbDouwe Maan2016-01-113-22/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | use JavaScript instead of CoffeeScript in Views for master
| * | | | | | | | | | | | use JavaScript instead of CoffeeScript in Views, the reason #9819Jason Lee2016-01-113-22/+24
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-build-status-caching' into 'master' Dmitriy Zaporozhets2016-01-111-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix caching issue where build status was not updating in project dashboard The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable. Closes #3268 See merge request !2353
| * | | | | | | | | | | | | Fix caching issue where build status was not updating in project dashboardStan Hu2016-01-081-5/+8
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3268
* | | | | | | | | | | | | Merge branch 'load-autocomplete-when-needed' into 'master' Dmitriy Zaporozhets2016-01-112-12/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only load autocomplete data when actually needed See merge request !2365
| * | | | | | | | | | | | | Only load autocomplete data when actually neededYorick Peterse2016-01-112-12/+15
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this would result in autocomplete data being loaded for every page (e.g. the page showing all Git branches of a project).
* | | | | | | | | | | | | Merge branch 'fix-build-page-typo' into 'master' Kamil Trzciński2016-01-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in build page of projects The column containing links to the builds is named Runner but actually contains the Build. See merge request !2347
| * | | | | | | | | | | | Fix typo in build page of projectsSteffen Köhler2016-01-101-1/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The column containing links to the builds is named Runner but actually contains the Build ID. [ci skip]
* | | | | | | | | | | | Merge branch 'autocomplete-on-load' into 'master' Dmitriy Zaporozhets2016-01-111-13/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load autocomplete data when loading an issue page See merge request !2312
| * | | | | | | | | | | | Load autocomplete data when loading an issue pageautocomplete-on-loadYorick Peterse2016-01-081-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the dropdown is fully available the moment a user starts typing out a username, issue ID, etc. While this won't speed up loading the autocomplete data itself it should at least make it less annoying for the user.
* | | | | | | | | | | | | Merge branch 'new-branch-position-fix' into 'master' Dmitriy Zaporozhets2016-01-112-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes new branch button positioning, when visible and not visible container Fixes #5893 #5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. See merge request !2348
| * | | | | | | | | | | | | fixes new branch button positioning, when visible and not visible containernew-branch-position-fixJacob Schatz2016-01-082-2/+7
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'add-pencil-icon-to-group-page' into 'master' Dmitriy Zaporozhets2016-01-111-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pencil icon to edit group settings Move icons to upper-right corner of group page Before: ![image](/uploads/6694c33eae6e10a4e21efef465a07114/image.png) After: ![image](/uploads/0c17c2cf89fc0fde4344911b30f2635c/image.png) Closes #6038 See merge request !2361
| * | | | | | | | | | | | | Check for current userStan Hu2016-01-101-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add pencil icon to edit group settingsStan Hu2016-01-101-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move icons to upper-right corner of group page Closes #6038
* | | | | | | | | | | | | | Merge branch 'fix-duplicate-branch-activity' of ↵Dmitriy Zaporozhets2016-01-112-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce
| * | | | | | | | | | | | | | Fix duplicated branch creation/deletion events when using Web UIStan Hu2016-01-082-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting a branch, this is what was happening: 1. DeleteBranchService calls EventCreateService and creates an event. 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls EventCreateService again. 5145706c now makes it no longer necessary for DeleteBranchService and CreateBranchService to create an event. Closes #4304
* | | | | | | | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-1113-38/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'Issue#5817' into 'master' Stan Hu2016-01-112-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue#5817 Improve wording of the web hooks page on the project's setting Merge Request !2362 had a typo, I'm resubmitting the merge request about issue #5817. See merge request !2363
| | * | | | | | | | | | | | | | Issue #5817 wording of the web hooks updated on issue and merge eventsiqualisoni2016-01-112-4/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Before project save ensure that a runners_token existsStan Hu2016-01-101-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix Error 500 when visiting build page of project with nil runners_tokenStan Hu2016-01-102-5/+7
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly ensure that the token exists and add defensively check for a non-nil value. Closes #4294
| * | | | | | | | | | | | | | Merge branch 'fix_jira_shortterm' into 'master' Robert Speicher2016-01-101-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not call API if there is no API URL Fixes #5878 CE users may not be interested in the new JIRA features. In this case, we should detect they haven't set an API URL and fallback to the behavior pre-8.3. This patch does that very easily. There are planned improvements to JIRA in future releases such as gitlab-org/gitlab-ce#5541 which will make this more configurable. See merge request !2341
| | * | | | | | | | | | | | | Do not call API if there is no API URLDrew Blessing2016-01-071-0/+3
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | Disable "Already Blocked" button in admin abuse report pageStan Hu2016-01-091-1/+1
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'cross-project-reference-typo-fix' into 'master' Robert Speicher2016-01-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes verb `references` to noun `reference`. See merge request !2349
| | * | | | | | | | | | | | changes verb `references` to noun `reference`.cross-project-reference-typo-fixJacob Schatz2016-01-081-1/+1
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Remove Block Button from Abuse Reports page if User is Already Blocked Robert Speicher2016-01-081-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292 Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667 See merge request !2313
| | * | | | | | | | | | | | Show that user is already blocked on Abuse Reportsfix-block-button-still-showing-on-abuse-reports-after-user-is-blockedKelvin2016-01-061-0/+3
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Remove block button on abuse reports if user is already blockedKelvin2016-01-061-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-084-26/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
| | * | | | | | | | | | | | DRY up upload and download servicesapi-project-uploadDouwe Maan2016-01-083-24/+17
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add API project upload endpointDouwe Maan2016-01-073-14/+14
| | | | | | | | | | | | | |
View Lorry Controller Status