Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
C
CCS Proposals
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 7
    • Merge Requests 7
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Package Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • monero-project
  • CCS Proposals
  • Merge Requests
  • !100

Merged
Opened Oct 18, 2019 by Diego Salazar@rehrarMaintainer

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://repo.getmonero.org/rehrar/ccs-proposals.git" "rehrar-36c3"
git checkout -b "rehrar/ccs-proposals-rehrar-36c3" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "master"
git merge --no-ff "rehrar/ccs-proposals-rehrar-36c3"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Rehrar 36c3

  • Overview 3
  • Commits 2
  • Changes 1

Heyo everyone. Welcome back to another edition of "rehrar asks for money to do Monero related things". In this episode, rehrar wants to go back to C3. So I guess this one is called rehrar to C3 2: Return of Jafar.

Basically, similar to last year, I want to go help at 36C3. Last year I was the MC, did general coordination, and helped to run the floor and speeches, as well as giving a few speeches on my own.

The costs to send me to Leipzig is as follows:

Flight 1700

Hotel 630

Incidentals 565

Ticket 140

For a total of 3035.

Converted to XMR (With a 10% buffer): 58.65 XMR.

IF the community thinks I would be of value to go to C3, then let's get this tagged and bagged. Thanks all!

Edited Oct 18, 2019 by Diego Salazar
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: monero-project/ccs-proposals!100
Source branch: rehrar-36c3

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.