summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Put back the new project button27354-navigation-new-buttonAnnabel Dunstone Gray2017-02-221-0/+4
|
* Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-2210-12/+40
|\ | | | | | | | | | | | | Add merge request count to each issue on issues list Closes #19786 and #23208 See merge request !9252
| * Added space indentation in models/merge_requests_closing_issues.rbblackst0ne2017-02-221-2/+2
| |
| * Refactored count_for_collection() for using pluck instead of selectblackst0ne2017-02-212-5/+5
| |
| * Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-21201-1212/+884
| |\
| * | Remove empty line in noteblackst0ne2017-02-181-1/+0
| | |
| * | Added second parameter to @issuable_meta_data variablesblackst0ne2017-02-172-2/+2
| | |
| * | Merge branch 'add_mr_info_to_issues_list' of gitlab.com:blackst0ne/gitlab-ce ↵blackst0ne2017-02-17100-1417/+1667
| |\ \ | | | | | | | | | | | | into add_mr_info_to_issues_list
| | * | Add merge request count to each issue on issues listblackst0ne2017-02-178-10/+38
| | | |
| * | | Add merge request count to each issue on issues listblackst0ne2017-02-178-10/+38
| | | |
| * | | Merge remote-tracking branch 'upstream/master'blackst0ne2017-02-153-8/+10
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'blackst0ne2017-02-15341-1855/+4402
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:blackst0ne/gitlab-ceblackst0ne2017-02-061-0/+1
| |\ \ \ \ \
| | * | | | | [ci skip] Add a comment explaining validate_board_limit callbackDouglas Barbosa Alexandre2016-10-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callback associations are not common to see around. We want to make clear that the `before_add` callback uses the number before the addition, in this particular case 1.
| | * | | | | Fix GitLab project import when a user has access only to their default ↵Adam Niedzielski2016-10-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace. Render a hidden field with namespace ID so it can be read by JavaScript and passed to "/import/gitlab_project/new" screen.
| | * | | | | Create protected branches bundleAlfredo Sumaran2016-10-217-0/+3
| | | | | | |
| | * | | | | Only create refs for new deploymentsZ.J. van de Weg2016-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes sure GitLab does not save the refs to the filesystem each time the deployment is updated. This will save some IO although I expect the impact to be minimal.
| | * | | | | Use deployment IID when saving refsZ.J. van de Weg2016-10-212-3/+3
| | | | | | |
| | * | | | | Update duration at the end of pipelineKamil Trzcinski2016-10-211-3/+0
| | | | | | |
| | * | | | | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-211-6/+11
| | | | | | |
| | * | | | | Use guard clause instead of if-else statementAirat Shigapov2016-10-211-13/+12
| | | | | | |
| | * | | | | Clean up Banzai HTML for HipChatDavid Eisner2016-10-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `class` and `data-*` attributes are meaningless in HipChat, and it would probably be better to limit the tags, too. For example, we could avoid block-level elements in `render_line`.
| | * | | | | Ensure absolute URLs for single lines from Banzai for HipChatDavid Eisner2016-10-211-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "pipeline: :single_line" leaves the protocol/host part out of the URLs and caches them that way. To avoid giving those out to HipChat, markdown is always rendered with "pipeline: :email" first. There must be a better way to do this, but I can't see how to avoid the link caching.
| | * | | | | Absolute URLs for Banzai HTML for HipChatDavid Eisner2016-10-211-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using "pipeline: :email" gets "only_path: false" into the context to produce full URLs instead of /namespace/project/...
| | * | | | | Also render commit titles in HipChat notificationsDavid Eisner2016-10-211-4/+8
| | | | | | |
| | * | | | | Full Banzai rendering for HipChat notificationsDavid Eisner2016-10-211-11/+3
| | | | | | |
| | * | | | | Render hipchat notification descriptions as HTML instead of raw markdownAirat Shigapov2016-10-211-6/+3
| | | | | | |
| | * | | | | Rename forked_source_project_missing? to source_project_missing?Nick Thomas2016-10-211-3/+3
| | | | | | |
| | * | | | | Fix two CI endpoints for MRs where the source project is deletedNick Thomas2016-10-211-1/+1
| | | | | | |
| | * | | | | Fix the merge request view when source projects or branches are removedNick Thomas2016-10-214-18/+22
| | | | | | |
| | * | | | | Revert "Add #closed_without_source_project?"Nick Thomas2016-10-212-25/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 31c37c6c38258684fc92e0d91119c33872e39034. See #23341
| | * | | | | Added dyanmic position adjustmentLuke Bennett2016-10-217-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tooltips for dropdown items Reverted pretty much everything in favour of a DOM approach Simplified JS
| | * | | | | Added tooltip with jobs full name to build items in graphLuke Bennett2016-10-213-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added status to build tooltip and removed status icon tooltip Added Pipelines class to force tooltips ontop of the dropdown, we cannot do this with data attributes because dropdown toggle is already set Corrected dispatcher invocation
| | * | | | | Change input order on Sign In form for better tabbing.Clement Ho2016-10-212-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This *unreverts* 8751491b, which was mistakenly reverted in !6328. It also changes the implementation of the original commit to work with the new login styling and markup. cc: @ClemMakesApps
| | * | | | | Restrict ProjectCacheWorker jobs to one per 15 minYorick Peterse2016-10-211-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures ProjectCacheWorker jobs for a given project are performed at most once per 15 minutes. This should reduce disk load a bit in cases where there are multiple pushes happening (which should schedule multiple ProjectCacheWorker jobs).
| | * | | | | Removed code from project members controllerPhil Hughes2016-10-211-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was meant to be added to another branch as an expirement, but instead was commited to wrong branch
| | * | | | | Create project feature when project is createdFelipe Artur2016-10-211-6/+1
| | | | | | |
| | * | | | | Refactoring find_commits functionalityValery Sizov2016-10-212-4/+7
| | | | | | |
| | * | | | | Simpler arguments passed to named_route on toggle_award_url helper methodPaco Guzman2016-10-211-2/+2
| | | | | | |
| | * | | | | Differentiate the expire from leave eventCallum Dryden2016-10-214-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the moment we cannot see weather a user left a project due to their membership expiring of if they themselves opted to leave the project. This adds a new event type that allows us to make this differentiation. Note that is not really feasable to go back and reliably fix up the previous events. As a result the events for previous expire removals will remain the same however events of this nature going forward will be correctly represented.
| | * | | | | Fixed height of issue board blank statePhil Hughes2016-10-211-2/+1
| | | | | | |
| | * | | | | Smaller min-width for MR pipeline tableAnnabel Dunstone Gray2016-10-211-0/+4
| | | | | | |
| | * | | | | Add hover to trash icon in notesblackst0ne2016-10-201-1/+1
| | | | | | |
* | | | | | | Merge branch '24651-environments-list-buttons' into 'master' Annabel Dunstone Gray2017-02-223-39/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the environments list action buttons Closes #24651 See merge request !9424
| * | | | | | | Use a btn-group to group all action buttons24651-environments-list-buttonsFilipa Lacerda2017-02-213-39/+42
| | | | | | | |
* | | | | | | | Merge branch 'lnovy/gitlab-ce-empty-variables' into 'master'Rémy Coutable2017-02-221-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Allow a project variable to be set to an empty value See merge request !9414
| * | | | | | | | UI: Allow a project variable to be set to an empty valueLukáš Nový2017-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'Rémy Coutable2017-02-221-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add AsciiDoc snippet for CI/CD Badges Closes #26087 See merge request !9164
| * | | | | | | | | Add AsciiDoc snippet for CI/CD BadgesJan Christophersen2017-02-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds CI/CD Badges Snippets for AsciiDoc as requested in #26087. I've however run into an issue in highlighting the snippet, it seems as if AsciiDoc is currently not being highlighted properly (displayed as plaintext) Add testcase for to_asciidoc Update test case for Badges list
* | | | | | | | | | Merge branch '22132-rename-branch-name-params-to-branch' into 'master' Rémy Coutable2017-02-221-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize branch name params as `branch` on V4 API Closes #22132 See merge request !8936
View Lorry Controller Status