summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Check for env[Grape::Env::GRAPE_ROUTING_ARGS] instead of endpoint.route26587-metrics-middleware-endpoint-is-nilRémy Coutable2017-01-123-4/+26
| | | | | | | `endpoint.route` is calling `env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info]` but `env[Grape::Env::GRAPE_ROUTING_ARGS]` is `nil` in the case of a 405 response Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'add-changelog-search-bar-first-iteration' into 'master' Jacob Schatz2017-01-121-0/+4
|\ | | | | | | | | Add changelog for search-bar-first-iteration See merge request !8546
| * Add changelog for search-bar-first-iterationClement Ho2017-01-121-0/+4
| |
* | Merge branch 'redundant-parenthesis-removal-in-test' into 'master' Robert Speicher2017-01-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Remove redundant parentheses in TodosController spec [ci skip] See merge request !8548
| * | fixes the issueTiago Botelho2017-01-121-1/+1
|/ /
* | Merge branch 'use-configured-git' into 'master' Douwe Maan2017-01-125-14/+14
|\ \ | | | | | | | | | | | | Use configured git rather thans system git See merge request !8460
| * | Use configured git rather than system gituse-configured-gitRobert Schilling2017-01-055-14/+14
| | |
* | | Merge branch 'zj-unadressable-url-variables' into 'master' Douwe Maan2017-01-124-18/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Do not check for valid url for .gitlab-ci.yml Closes #22970 See merge request !8451
| * | | Add changelog [ci skip]zj-unadressable-url-variablesZ.J. van de Weg2017-01-051-0/+4
| | | |
| * | | Do not check for valid url for .gitlab-ci.ymlZ.J. van de Weg2017-01-053-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until this commit, GitLab would check if the URL in your .gitlab-ci.yml would be valid and adressable. However, this approach is rather limited. To begin, the URL couldn't be http://example:$PORT/my-project, as the PORT value would be interpolated after checking if the URL was valid, which its not. Also this gem will limit the amount of protocols allowed. This commit doesn't check, at all, if the URL is valid. This is now the responsablilty of the user. In my opion this is right, as the user ultimately benefits from a correct URL, but also, its impossible to cover all cases.
* | | | Merge branch 'fill-authorized-projects' into 'master' Douwe Maan2017-01-123-0/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fill missing authorized projects rows Closes #26194 See merge request !8476
| * | | | Fill missing authorized projects rowsfill-authorized-projectsYorick Peterse2017-01-113-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the project_authorizations rows exist for all users for which this data has not yet been populated. Fixes #26194
* | | | | Merge branch 'fix-more-orphans-remove-undeleted-groups' into 'master' Douwe Maan2017-01-122-24/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove more orphans when removing stray namespaces Closes #25146 See merge request !7841
| * | | | | Remove more orphans when removing stray namespacesfix-more-orphans-remove-undeleted-groupsYorick Peterse2017-01-112-24/+76
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25146
* | | | | | Merge branch '26109-preserve-scroll-position-on-autoreload' into 'master' Alfredo Sumaran2017-01-122-2/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scroll to bottom on build completion if autoscroll was active Closes #26109 See merge request !8391
| * | | | | | Use string constant variable for `#down-build-trace`26109-preserve-scroll-position-on-autoreloadKushal Pandya2017-01-121-4/+4
| | | | | | |
| * | | | | | Use better approach to access hashKushal Pandya2017-01-121-5/+2
| | | | | | |
| * | | | | | Feature changelog entryKushal Pandya2017-01-121-0/+4
| | | | | | |
| * | | | | | Scroll to bottom on build completion if autoscroll was activeKushal Pandya2017-01-121-1/+15
|/ / / / / /
* | | | | | Merge branch 'search-bar-first-iteration' into 'master' Jacob Schatz2017-01-1250-386/+4522
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search bar first iteration Closes #21747 See merge request !7345
| * | | | | | Fix rubocopsearch-bar-first-iterationClement Ho2017-01-111-11/+11
| | | | | | |
| * | | | | | Backend reviewClement Ho2017-01-118-19/+195
| | | | | | |
| * | | | | | Add comments to issuable finderClement Ho2017-01-101-0/+2
| | | | | | |
| * | | | | | Remove duplicate methodClement Ho2017-01-091-18/+0
| | | | | | |
| * | | | | | Fix code review suggestionsClement Ho2017-01-092-5/+7
| | | | | | |
| * | | | | | Fix indentationClement Ho2017-01-091-14/+15
| | | | | | |
| * | | | | | Fix javascript error for when there are no issuesClement Ho2017-01-091-7/+10
| | | | | | |
| * | | | | | Code review changesClement Ho2017-01-093-2/+4
| | | | | | |
| * | | | | | Add symbolsClement Ho2017-01-091-4/+4
| | | | | | |
| * | | | | | Fix specsClement Ho2017-01-093-6/+14
| | | | | | |
| * | | | | | Enable filtering with multiple wordsClement Ho2017-01-093-3/+7
| | | | | | |
| * | | | | | Refactor addWordToInputClement Ho2017-01-097-66/+57
| | | | | | |
| * | | | | | Add haml lint commentClement Ho2017-01-091-0/+2
| | | | | | |
| * | | | | | Fix haml lintClement Ho2017-01-091-8/+8
| | | | | | |
| * | | | | | we're actually not using issue finder hereLin Jen-Shin2017-01-092-2/+1
| | | | | | |
| * | | | | | Make sure we could query against no oneLin Jen-Shin2017-01-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should separate the idea of not finding anyone, and the idea of against no one.
| * | | | | | Fix various styles for rubocopLin Jen-Shin2017-01-092-6/+6
| | | | | | |
| * | | | | | Show no issues if author/assignee cannot be foundLin Jen-Shin2017-01-091-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7345/diffs#note_19994225
| * | | | | | Check if it's not NONE tooLin Jen-Shin2017-01-091-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we don't have to check it again in somewhere else, and we don't really need to know if it's presented as NONE Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7345/diffs#note_20123999
| * | | | | | Pass the arguments from where we render the partialLin Jen-Shin2017-01-092-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thread: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7345/diffs#note_19707619
| * | | | | | Fix specsClement Ho2017-01-096-62/+36
| | | | | | |
| * | | | | | Fix specsClement Ho2017-01-096-16/+30
| | | | | | |
| * | | | | | Refactor and use regex for string processingClement Ho2017-01-0910-536/+189
| | | | | | |
| * | | | | | Remove unused finder variableClement Ho2017-01-091-3/+0
| | | | | | |
| * | | | | | Add specs for remaining dropdownsClement Ho2017-01-097-51/+782
| | | | | | |
| * | | | | | Make changes to make it more flexible for new filtersClement Ho2017-01-094-5/+23
| | | | | | |
| * | | | | | Define filtered_search as a variableClement Ho2017-01-092-6/+2
| | | | | | |
| * | | | | | Create dropdown hint specClement Ho2017-01-093-6/+152
| | | | | | |
| * | | | | | Add selected tagName check for itemClickedClement Ho2017-01-092-15/+20
| | | | | | |
| * | | | | | Fix dropdown hint reset when changing tabsClement Ho2017-01-091-1/+9
| | | | | | |
View Lorry Controller Status