summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Load related MRs/branches asynchronouslyasync-related-mrsYorick Peterse2016-04-136-15/+66
* Merge branch 'rs-archive-cache-worker-cron' into 'master' Dmitriy Zaporozhets2016-04-134-2/+6
|\
| * Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cronRobert Speicher2016-04-124-2/+6
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-04-13118-481/+4246
|\ \
| * \ Merge branch 'rs-gitlab-com-check' into 'master' Dmitriy Zaporozhets2016-04-132-0/+20
| |\ \
| | * | Add `Gitlab.com?` methodrs-gitlab-com-checkRobert Speicher2016-04-122-0/+20
| * | | Merge branch 'api-group-leaking' into 'master' Rémy Coutable2016-04-134-14/+21
| |\ \ \
| | * | | Fix group_member_spec to not leak informationRobert Schilling2016-04-131-5/+7
| | * | | API: Avoid group leak while updating the groupRobert Schilling2016-04-131-2/+2
| | * | | API: Return 404 if user does not have access to groupRobert Schilling2016-04-133-7/+12
| * | | | Merge branch 'api-move-issues' into 'master' Rémy Coutable2016-04-134-1/+148
| |\ \ \ \
| | * | | | Fix doc for moving an issueRobert Schilling2016-04-131-1/+1
| | * | | | Update tests for moving issues via APIRobert Schilling2016-04-134-30/+51
| | * | | | API: Ability to move an issueRobert Schilling2016-04-134-1/+127
| * | | | | Merge branch 'patch-2' into 'master' Robert Schilling2016-04-131-1/+1
| |\ \ \ \ \
| | * | | | | improve formattingBen Bodenmiller2016-04-121-1/+1
| * | | | | | Merge branch 'custom-transaction-tags' into 'master' Rémy Coutable2016-04-133-0/+36
| |\ \ \ \ \ \
| | * | | | | | Added ability to add custom tags to transactionsYorick Peterse2016-04-133-0/+36
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'configure_trusted_proxies' into 'master' Rémy Coutable2016-04-135-0/+24
| |\ \ \ \ \ \
| | * | | | | | Updated trusted proxies doc section to link to the restart GitLab docsconfigure_trusted_proxiesDJ Mountney2016-04-121-1/+2
| | * | | | | | Add changelog entries, install docs, and gitlab.yml.example entry for the tru...DJ Mountney2016-04-123-0/+20
| | * | | | | | Adjust the default trusted_proxies to only include localhost, and allow other...DJ Mountney2016-04-122-0/+3
| * | | | | | | Merge branch 'jira_docs' into 'master' Achilleas Pipinellis2016-04-132-5/+17
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Tie example config to JIRA screenshotAchilleas Pipinellis2016-04-132-5/+17
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'issue_15044' into 'master' Rémy Coutable2016-04-134-6/+37
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add changelog entry, improve specs and model codeissue_15044Felipe Artur2016-04-123-14/+9
| | * | | | | Allow to close invalid merge requestFelipe Artur2016-04-113-5/+41
| * | | | | | Merge branch 'docs-new-branch-button-3886' into 'master' Achilleas Pipinellis2016-04-132-0/+32
| |\ \ \ \ \ \
| | * | | | | | Move 'New branch from issue' feature doc to web_editor.mdAchilleas Pipinellis2016-04-133-9/+32
| | * | | | | | Docs for the new branch buttondocs-new-branch-button-3886Zeger-Jan van de Weg2016-03-282-0/+9
| * | | | | | | Merge branch 'fix-stale-branch-count-cache' into 'master' Yorick Peterse2016-04-133-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Fix repository cache invalidation issue when project is recreated with an emp...Stan Hu2016-04-133-0/+5
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'api-group-visibility' into 'master' Rémy Coutable2016-04-134-2/+152
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix minor issues according development guidelinesRobert Schilling2016-04-123-11/+17
| | * | | | | | API: Ability to update a groupRobert Schilling2016-04-124-2/+146
| * | | | | | | Merge branch 'notes-input' into 'master' Jacob Schatz2016-04-123-5/+36
| |\ \ \ \ \ \ \
| | * | | | | | | Remove max-width from commentsnotes-inputAnnabel Dunstone2016-04-122-14/+0
| | * | | | | | | Input updatesAnnabel Dunstone2016-04-123-5/+49
| | * | | | | | | Wrap text in notes box if longer than code in diffAnnabel Dunstone2016-04-121-0/+1
| * | | | | | | | Merge branch 'fix-todo-target-path' into 'master' Robert Speicher2016-04-122-0/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix todo_target_path for todos where target was removedfix-todo-target-pathDouglas Barbosa Alexandre2016-04-122-0/+4
| |/ / / / / / /
| * | | | | | | Merge branch 'rs-update-spring' into 'master' Robert Speicher2016-04-122-6/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Update spring and spring-commands-spinachrs-update-springRobert Speicher2016-04-122-6/+6
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'issue_14206' into 'master' Jacob Schatz2016-04-126-7/+160
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into issue_14206issue_14206Alfredo Sumaran2016-04-11214-943/+2578
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Rename method and initialize .timeago insideAlfredo Sumaran2016-04-114-19/+10
| | * | | | | | | Update datetime in .timeago elementsAlfredo Sumaran2016-04-073-6/+28
| | * | | | | | | Add datetime_utility.js.coffeeAlfredo Sumaran2016-04-071-0/+15
| | * | | | | | | Add date.format.jsAlfredo Sumaran2016-04-071-0/+125
| | * | | | | | | Convert time param to TimeAlfredo Sumaran2016-04-071-1/+1